msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Small improvements

Browse Source
pull/214/head
M66B 2 years ago
parent 20ef3967d8
commit ef2cb5d52f
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

46
app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
Unescape View File

@ -78,21 +78,23 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
CalendarContract.Calendars.ACCOUNT_NAME + "," + CalendarContract.Calendars.ACCOUNT_NAME + "," +
CalendarContract.Calendars.CALENDAR_DISPLAY_NAME CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
)) { )) {
int colId = cursor.getColumnIndexOrThrow(CalendarContract.Calendars._ID); if (cursor != null) {
int colAccount = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_NAME); int colId = cursor.getColumnIndexOrThrow(CalendarContract.Calendars._ID);
int colType = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_TYPE); int colAccount = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_NAME);
int colPrimary = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.IS_PRIMARY); int colType = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_TYPE);
int colVisible = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.VISIBLE); int colPrimary = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.IS_PRIMARY);
int colDisplay = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME); int colVisible = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.VISIBLE);
while (cursor.moveToNext()) { int colDisplay = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME);
long id = cursor.getLong(colId); while (cursor.moveToNext()) {
String account = cursor.getString(colAccount); long id = cursor.getLong(colId);
String type = cursor.getString(colType); String account = cursor.getString(colAccount);
boolean primary = (cursor.getInt(colPrimary) != 0); String type = cursor.getString(colType);
boolean visible = (cursor.getInt(colVisible) != 0); boolean primary = (cursor.getInt(colPrimary) != 0);
String name = cursor.getString(colDisplay); boolean visible = (cursor.getInt(colVisible) != 0);
if (account != null) String name = cursor.getString(colDisplay);
calendars.add(new Calendar(id, account, type, primary, visible, name)); if (account != null)
calendars.add(new Calendar(id, account, type, primary, visible, name));
}
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
@ -116,10 +118,10 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Calendar calendar = calendars.get(which); Calendar calendar = calendars.get(which);
getArguments().putLong("id", calendar.id); args.putLong("id", calendar.id);
getArguments().putString("account", calendar.account); args.putString("account", calendar.account);
getArguments().putString("type", calendar.type); args.putString("type", calendar.type);
getArguments().putString("name", calendar.name); args.putString("name", calendar.name);
sendResult(RESULT_OK); sendResult(RESULT_OK);
dismiss(); dismiss();
} }
@ -129,9 +131,9 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() { builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
getArguments().putLong("id", -1); args.putLong("id", -1);
getArguments().putString("account", null); args.putString("account", null);
getArguments().putString("type", null); args.putString("type", null);
sendResult(RESULT_OK); sendResult(RESULT_OK);
} }
}); });

Write Preview
Loading…
Cancel
Save