Merge pull request #492 from nfode/fix-allday-check

Add check if allday is set if event is created interactively

Author: EddyVerbruggen

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

@@ -361,21 +361,27 @@ private void createEventInteractively(JSONArray args) {
       cordova.getThreadPool().execute(new Runnable() {
         @Override
         public void run() {
-          final boolean isAllDayEvent = AbstractCalendarAccessor.isAllDayEvent(new Date(jsonFilter.optLong("startTime")), new Date(jsonFilter.optLong("endTime")));
-          final Intent calIntent = new Intent(Intent.ACTION_EDIT)
-                  .setType("vnd.android.cursor.item/event")
-                  .putExtra("title", getPossibleNullString("title", jsonFilter))
-                  .putExtra("hasAlarm", 1);
-          if(isAllDayEvent){
-            calIntent
-                    .putExtra("allDay", isAllDayEvent)
-                    .putExtra("beginTime", jsonFilter.optLong("startTime") + TimeZone.getDefault().getOffset(jsonFilter.optLong("startTime")))
-                    .putExtra("endTime", jsonFilter.optLong("endTime") + TimeZone.getDefault().getOffset(jsonFilter.optLong("endTime")))
-                    .putExtra("eventTimezone", "TIMEZONE_UTC");
+
+          boolean isAllDayEvent = false;
+          String allDayOption = getPossibleNullString("allday", argOptionsObject);
+          if (allDayOption != null) {
+            isAllDayEvent = Boolean.parseBoolean(allDayOption);
+          } else {
+            isAllDayEvent = AbstractCalendarAccessor.isAllDayEvent(new Date(jsonFilter.optLong("startTime")),
+                new Date(jsonFilter.optLong("endTime")));
+          }
+          final Intent calIntent = new Intent(Intent.ACTION_EDIT).setType("vnd.android.cursor.item/event")
+              .putExtra("title", getPossibleNullString("title", jsonFilter)).putExtra("hasAlarm", 1);
+          if (isAllDayEvent) {
+            calIntent.putExtra("allDay", isAllDayEvent)
+                .putExtra("beginTime",
+                    jsonFilter.optLong("startTime") + TimeZone.getDefault().getOffset(jsonFilter.optLong("startTime")))
+                .putExtra("endTime",
+                    jsonFilter.optLong("endTime") + TimeZone.getDefault().getOffset(jsonFilter.optLong("endTime")))
+                .putExtra("eventTimezone", "TIMEZONE_UTC");
           } else {
-            calIntent
-                    .putExtra("beginTime", jsonFilter.optLong("startTime"))
-                    .putExtra("endTime", jsonFilter.optLong("endTime"));
+            calIntent.putExtra("beginTime", jsonFilter.optLong("startTime")).putExtra("endTime",
+                jsonFilter.optLong("endTime"));
           }
 
           // TODO can we pass a reminder here?