#294 Calendar plugin along with Phonegap-Plugin-Push crashes the app in android.

Author: EddyVerbruggen

README.md

@@ -265,6 +265,11 @@ Creating an event for 3 full days
 On Android 6 you need to request permission to use the Calendar at runtime when targeting API level 23+.
 Even if the `uses-permission` tags for the Calendar are present in `AndroidManifest.xml`.
 
+Since plugin version 4.5.0 we transparently handle this for you in a just-in-time manner.
+So if you call `createEvent` we will pop up the permission dialog. After the user granted access
+to his calendar the event will be created.
+
+You can also manually manage and check permissions if that's your thing.
 Note that the hasPermission functions will return true when:
 
 - You're running this on iOS, or
@@ -273,6 +278,7 @@ Note that the hasPermission functions will return true when:
 - You've already granted permission.
 
 ```js
+  // again, this is no longer needed with plugin version 4.5.0 and up
   function hasReadWritePermission() {
     window.plugins.calendar.hasReadWritePermission(
       function(result) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-calendar",
-  "version": "4.4.8-dev",
+  "version": "4.5.0",
   "description": "This plugin allows you to manipulate the native calendar.",
   "cordova": {
     "id": "cordova-plugin-calendar",

plugin.xml

@@ -3,7 +3,7 @@
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-calendar"
-    version="4.4.8-dev">
+    version="4.5.0">
 
   <name>Calendar</name>
 
@@ -73,6 +73,6 @@
                  target-dir="src/nl/xservices/plugins/accessor"/>
     <source-file src="src/android/nl/xservices/plugins/accessor/LegacyCalendarAccessor.java"
                  target-dir="src/nl/xservices/plugins/accessor"/>
-    <framework src="com.android.support:support-v4:+" />
+    <dependency id="cordova-plugin-compat" version="^1.0.0" />
   </platform>
 </plugin>

src/android/nl/xservices/plugins/Calendar.java

@@ -11,14 +11,13 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.CalendarContract;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import nl.xservices.plugins.accessor.AbstractCalendarAccessor;
 import nl.xservices.plugins.accessor.CalendarProviderAccessor;
 import nl.xservices.plugins.accessor.LegacyCalendarAccessor;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.PermissionHelper;
 import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -49,16 +48,29 @@ public class Calendar extends CordovaPlugin {
   private static final String ACTION_LIST_CALENDARS = "listCalendars";
   private static final String ACTION_CREATE_CALENDAR = "createCalendar";
 
+  // write permissions
+  private static final int PERMISSION_REQCODE_CREATE_CALENDAR = 100;
+  private static final int PERMISSION_REQCODE_DELETE_EVENT = 101;
+  private static final int PERMISSION_REQCODE_CREATE_EVENT = 102;
+
+  // read permissions
+  private static final int PERMISSION_REQCODE_FIND_EVENTS = 200;
+  private static final int PERMISSION_REQCODE_LIST_CALENDARS = 201;
+  private static final int PERMISSION_REQCODE_LIST_EVENTS_IN_RANGE = 202;
+
   private static final Integer RESULT_CODE_CREATE = 0;
   private static final Integer RESULT_CODE_OPENCAL = 1;
 
+  private JSONArray requestArgs;
   private CallbackContext callback;
 
   private static final String LOG_TAG = AbstractCalendarAccessor.LOG_TAG;
 
   @Override
   public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
-    callback = callbackContext;
+    this.callback = callbackContext;
+    this.requestArgs = args;
+
     final boolean hasLimitedSupport = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
 
     if (ACTION_OPEN_CALENDAR.equals(action)) {
@@ -104,13 +116,13 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
       hasReadWritePermission();
       return true;
     } else if (REQUEST_READ_PERMISSION.equals(action)) {
-      requestReadPermission();
+      requestReadPermission(0);
       return true;
     } else if (REQUEST_WRITE_PERMISSION.equals(action)) {
-      requestWritePermission();
+      requestWritePermission(0);
       return true;
     } else if (REQUEST_READWRITE_PERMISSION.equals(action)) {
-      requestReadWritePermission();
+      requestReadWritePermission(0);
       return true;
     }
     return false;
@@ -131,39 +143,59 @@ private void hasReadWritePermission() {
         calendarPermissionGranted(Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR)));
   }
 
-  private void requestReadPermission() {
-    requestPermission(Manifest.permission.READ_CALENDAR);
+  private void requestReadPermission(int requestCode) {
+    requestPermission(requestCode, Manifest.permission.READ_CALENDAR);
   }
 
-  private void requestWritePermission() {
-    requestPermission(Manifest.permission.WRITE_CALENDAR);
+  private void requestWritePermission(int requestCode) {
+    requestPermission(requestCode, Manifest.permission.WRITE_CALENDAR);
   }
 
-  private void requestReadWritePermission() {
-    requestPermission(Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR);
+  private void requestReadWritePermission(int requestCode) {
+    requestPermission(requestCode, Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR);
   }
 
   private boolean calendarPermissionGranted(String... types) {
     if (Build.VERSION.SDK_INT < 23) {
       return true;
     }
     for (final String type : types) {
-      if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this.cordova.getActivity(), type)) {
+      if (!PermissionHelper.hasPermission(this, type)) {
         return false;
       }
     }
     return true;
   }
 
-  private void requestPermission(String... types) {
+  private void requestPermission(int requestCode, String... types) {
     if (!calendarPermissionGranted(types)) {
-      ActivityCompat.requestPermissions(
-          this.cordova.getActivity(),
-          types,
-          555);
+      PermissionHelper.requestPermissions(this, requestCode, types);
+    }
+  }
+
+  public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) throws JSONException {
+    for (int r : grantResults) {
+      if (r == PackageManager.PERMISSION_DENIED) {
+        Log.d(LOG_TAG, "Permission Denied!");
+        this.callback.error("Please allow access to the Calendar and try again.");
+        return;
+      }
+    }
+
+    // now call the originally requested actions
+    if (requestCode == PERMISSION_REQCODE_CREATE_CALENDAR) {
+      createCalendar(requestArgs);
+    } else if (requestCode == PERMISSION_REQCODE_CREATE_EVENT) {
+      createEvent(requestArgs);
+    } else if (requestCode == PERMISSION_REQCODE_DELETE_EVENT) {
+      deleteEvent(requestArgs);
+    } else if (requestCode == PERMISSION_REQCODE_FIND_EVENTS) {
+      findEvents(requestArgs);
+    } else if (requestCode == PERMISSION_REQCODE_LIST_CALENDARS) {
+      listCalendars();
+    } else if (requestCode == PERMISSION_REQCODE_LIST_EVENTS_IN_RANGE) {
+      listEventsInRange(requestArgs);
     }
-    // this method executes async and we seem to have no known way to receive the result, so simply returning ok now
-    this.callback.success();
   }
 
   private void openCalendarLegacy(JSONArray args) {
@@ -215,8 +247,7 @@ private void listCalendars() {
     // note that if the dev didn't call requestReadPermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.READ_CALENDAR)) {
-      requestReadPermission();
-      this.callback.error("Please allow Read access to the Calendar and try again.");
+      requestReadPermission(PERMISSION_REQCODE_LIST_CALENDARS);
       return;
     }
     cordova.getThreadPool().execute(new Runnable() {
@@ -247,8 +278,7 @@ private void createCalendar(JSONArray args) {
     // note that if the dev didn't call requestWritePermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.WRITE_CALENDAR)) {
-      requestWritePermission();
-      this.callback.error("Please allow Write access to the Calendar and try again.");
+      requestWritePermission(PERMISSION_REQCODE_CREATE_CALENDAR);
       return;
     }
 
@@ -359,8 +389,7 @@ private void deleteEvent(JSONArray args) {
     // note that if the dev didn't call requestWritePermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.WRITE_CALENDAR)) {
-      requestWritePermission();
-      this.callback.error("Please allow Write access to the Calendar and try again.");
+      requestWritePermission(PERMISSION_REQCODE_DELETE_EVENT);
       return;
     }
 
@@ -397,8 +426,7 @@ private void findEvents(JSONArray args) {
     // note that if the dev didn't call requestReadPermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.READ_CALENDAR)) {
-      requestReadPermission();
-      this.callback.error("Please allow Read access to the Calendar and try again.");
+      requestReadPermission(PERMISSION_REQCODE_FIND_EVENTS);
       return;
     }
 
@@ -429,8 +457,7 @@ private void createEvent(JSONArray args) {
     // note that if the dev didn't call requestWritePermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.WRITE_CALENDAR)) {
-      requestWritePermission();
-      this.callback.error("Please allow Write access to the Calendar and try again.");
+      requestWritePermission(PERMISSION_REQCODE_CREATE_EVENT);
       return;
     }
 
@@ -476,13 +503,11 @@ private void listEventsInRange(JSONArray args) {
     // note that if the dev didn't call requestReadPermission before calling this method and calendarPermissionGranted returns false,
     // the app will ask permission and this method needs to be invoked again (done for backward compat).
     if (!calendarPermissionGranted(Manifest.permission.READ_CALENDAR)) {
-      requestReadPermission();
-      this.callback.error("Please allow Read access to the Calendar and try again.");
+      requestReadPermission(PERMISSION_REQCODE_LIST_EVENTS_IN_RANGE);
       return;
     }
     try {
       final JSONObject jsonFilter = args.getJSONObject(0);
-      JSONArray result = new JSONArray();
       long input_start_date = jsonFilter.optLong("startTime");
       long input_end_date = jsonFilter.optLong("endTime");
 
@@ -531,24 +556,26 @@ public void run() {
               "begin ASC");
 
           int i = 0;
-          while (cursor.moveToNext()) {
-            try {
-              result.put(
-                  i++,
-                  new JSONObject()
-                      .put("calendar_id", cursor.getString(cursor.getColumnIndex("calendar_id")))
-                      .put("event_id", cursor.getString(cursor.getColumnIndex("_id")))
-                      .put("title", cursor.getString(cursor.getColumnIndex("title")))
-                      .put("dtstart", cursor.getLong(cursor.getColumnIndex("begin")))
-                      .put("dtend", cursor.getLong(cursor.getColumnIndex("end")))
-                      .put("eventLocation", cursor.getString(cursor.getColumnIndex("eventLocation")) != null ? cursor.getString(cursor.getColumnIndex("eventLocation")) : "")
-                      .put("allDay", cursor.getInt(cursor.getColumnIndex("allDay")))
-              );
-            } catch (JSONException e) {
-              e.printStackTrace();
+          if (cursor != null) {
+            while (cursor.moveToNext()) {
+              try {
+                result.put(
+                    i++,
+                    new JSONObject()
+                        .put("calendar_id", cursor.getString(cursor.getColumnIndex("calendar_id")))
+                        .put("event_id", cursor.getString(cursor.getColumnIndex("_id")))
+                        .put("title", cursor.getString(cursor.getColumnIndex("title")))
+                        .put("dtstart", cursor.getLong(cursor.getColumnIndex("begin")))
+                        .put("dtend", cursor.getLong(cursor.getColumnIndex("end")))
+                        .put("eventLocation", cursor.getString(cursor.getColumnIndex("eventLocation")) != null ? cursor.getString(cursor.getColumnIndex("eventLocation")) : "")
+                        .put("allDay", cursor.getInt(cursor.getColumnIndex("allDay")))
+                );
+              } catch (JSONException e) {
+                e.printStackTrace();
+              }
             }
+            cursor.close();
           }
-          cursor.close();
 
           PluginResult res = new PluginResult(PluginResult.Status.OK, result);
           callback.sendPluginResult(res);