#289 java.lang.NullPointerException in nl.xservices.plugins.accessor.AbstractCalendarAccessor.getActiveCalendars

Author: EddyVerbruggen

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-calendar",
-  "version": "4.4.7",
+  "version": "4.4.8-dev",
   "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.7">
+    version="4.4.8-dev">
 
   <name>Calendar</name>
 

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

@@ -222,15 +222,17 @@ private void listCalendars() {
     cordova.getThreadPool().execute(new Runnable() {
       @Override
       public void run() {
-        JSONArray jsonObject = new JSONArray();
         try {
-          jsonObject = Calendar.this.getCalendarAccessor().getActiveCalendars();
+          JSONArray activeCalendars = Calendar.this.getCalendarAccessor().getActiveCalendars();
+          if (activeCalendars == null) {
+            activeCalendars = new JSONArray();
+          }
+          PluginResult res = new PluginResult(PluginResult.Status.OK, activeCalendars);
+          callback.sendPluginResult(res);
         } catch (JSONException e) {
           System.err.println("Exception: " + e.getMessage());
           callback.error(e.getMessage());
         }
-        PluginResult res = new PluginResult(PluginResult.Status.OK, jsonObject);
-        callback.sendPluginResult(res);
       }
     });
   }
@@ -469,7 +471,7 @@ public void run() {
   private static String getPossibleNullString(String param, JSONObject from) {
     return from.isNull(param) || "null".equals(from.optString(param)) ? null : from.optString(param);
   }
-  
+
   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).
@@ -479,7 +481,7 @@ private void listEventsInRange(JSONArray args) {
       return;
     }
     try {
-    final JSONObject jsonFilter = args.getJSONObject(0);
+      final JSONObject jsonFilter = args.getJSONObject(0);
       JSONArray result = new JSONArray();
       long input_start_date = jsonFilter.optLong("startTime");
       long input_end_date = jsonFilter.optLong("endTime");
@@ -490,7 +492,7 @@ private void listEventsInRange(JSONArray args) {
       } else {
         l_eventUri = Uri.parse("content://calendar/instances/when/" + String.valueOf(input_start_date) + "/" + String.valueOf(input_end_date));
       }
-    
+
       cordova.getThreadPool().execute(new Runnable() {
         @Override
         public void run() {
@@ -557,7 +559,7 @@ public void run() {
       callback.error(e.getMessage());
     }
   }
-  
+
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == RESULT_CODE_CREATE) {
       if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_CANCELED) {

src/android/nl/xservices/plugins/accessor/AbstractCalendarAccessor.java

@@ -262,6 +262,9 @@ public final JSONArray getActiveCalendars() throws JSONException {
         },
         this.getKey(KeyIndex.CALENDARS_VISIBLE) + "=1", null, null
     );
+    if (cursor == null) {
+      return null;
+    }
     JSONArray calendarsWrapper = new JSONArray();
     if (cursor.moveToFirst()) {
       do {