#92 deal with null params

EddyVerbruggen · Aug 31, 2014 · 6c9678d · 6c9678d
1 parent 5a68776
commit 6c9678d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugin.xml b/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="nl.x-services.plugins.calendar"
-    version="4.2.5">
+    version="4.2.6">
 
    <name>Calendar</name>
 

diff --git a/src/android/nl/xservices/plugins/Calendar.java b/src/android/nl/xservices/plugins/Calendar.java
@@ -163,8 +163,8 @@ private boolean findEvents(JSONArray args) {
     try {
       JSONObject jsonFilter = args.getJSONObject(0);
       JSONArray jsonEvents = getCalendarAccessor().findEvents(
-          jsonFilter.optString("title"),
-          jsonFilter.optString("location"),
+          jsonFilter.isNull("title") ? null : jsonFilter.optString("title"),
+          jsonFilter.isNull("location") ? null : jsonFilter.optString("location"),
           jsonFilter.optLong("startTime"),
           jsonFilter.optLong("endTime"));