Small improvements

app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java

@@ -78,6 +78,7 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
                 CalendarContract.Calendars.ACCOUNT_NAME + "," +
                         CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
         )) {
+            if (cursor != null) {
                 int colId = cursor.getColumnIndexOrThrow(CalendarContract.Calendars._ID);
                 int colAccount = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_NAME);
                 int colType = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_TYPE);
@@ -94,6 +95,7 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
                     if (account != null)
                         calendars.add(new Calendar(id, account, type, primary, visible, name));
                 }
+            }
         } catch (Throwable ex) {
             Log.e(ex);
         }
@@ -116,10 +118,10 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 Calendar calendar = calendars.get(which);
-                getArguments().putLong("id", calendar.id);
-                getArguments().putString("account", calendar.account);
-                getArguments().putString("type", calendar.type);
-                getArguments().putString("name", calendar.name);
+                args.putLong("id", calendar.id);
+                args.putString("account", calendar.account);
+                args.putString("type", calendar.type);
+                args.putString("name", calendar.name);
                 sendResult(RESULT_OK);
                 dismiss();
             }
@@ -129,9 +131,9 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
             builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    getArguments().putLong("id", -1);
-                    getArguments().putString("account", null);
-                    getArguments().putString("type", null);
+                    args.putLong("id", -1);
+                    args.putString("account", null);
+                    args.putString("type", null);
                     sendResult(RESULT_OK);
                 }
             });