Merge pull request #2 from opendatakit/master

Fixed IllegalArgumentException: Unterminated quote (getodk#1775)
Archaejohn · Jan 11, 2018 · 8ee3fb2 · 8ee3fb2
2 parents 2b2269b + 98624a8
commit 8ee3fb2
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/provider/InstanceProvider.java b/collect_app/src/main/java/org/odk/collect/android/provider/InstanceProvider.java
@@ -163,25 +163,30 @@ public Uri insert(@NonNull Uri uri, ContentValues initialValues) {
     }
 
     private String getDisplaySubtext(String state, Date date) {
-        if (state == null) {
-            return new SimpleDateFormat(getContext().getString(R.string.added_on_date_at_time),
-                    Locale.getDefault()).format(date);
-        } else if (InstanceProviderAPI.STATUS_INCOMPLETE.equalsIgnoreCase(state)) {
-            return new SimpleDateFormat(getContext().getString(R.string.saved_on_date_at_time),
-                    Locale.getDefault()).format(date);
-        } else if (InstanceProviderAPI.STATUS_COMPLETE.equalsIgnoreCase(state)) {
-            return new SimpleDateFormat(getContext().getString(R.string.finalized_on_date_at_time),
-                    Locale.getDefault()).format(date);
-        } else if (InstanceProviderAPI.STATUS_SUBMITTED.equalsIgnoreCase(state)) {
-            return new SimpleDateFormat(getContext().getString(R.string.sent_on_date_at_time),
-                    Locale.getDefault()).format(date);
-        } else if (InstanceProviderAPI.STATUS_SUBMISSION_FAILED.equalsIgnoreCase(state)) {
-            return new SimpleDateFormat(
-                    getContext().getString(R.string.sending_failed_on_date_at_time),
-                    Locale.getDefault()).format(date);
-        } else {
-            return new SimpleDateFormat(getContext().getString(R.string.added_on_date_at_time),
-                    Locale.getDefault()).format(date);
+        try {
+            if (state == null) {
+                return new SimpleDateFormat(getContext().getString(R.string.added_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            } else if (InstanceProviderAPI.STATUS_INCOMPLETE.equalsIgnoreCase(state)) {
+                return new SimpleDateFormat(getContext().getString(R.string.saved_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            } else if (InstanceProviderAPI.STATUS_COMPLETE.equalsIgnoreCase(state)) {
+                return new SimpleDateFormat(getContext().getString(R.string.finalized_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            } else if (InstanceProviderAPI.STATUS_SUBMITTED.equalsIgnoreCase(state)) {
+                return new SimpleDateFormat(getContext().getString(R.string.sent_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            } else if (InstanceProviderAPI.STATUS_SUBMISSION_FAILED.equalsIgnoreCase(state)) {
+                return new SimpleDateFormat(
+                        getContext().getString(R.string.sending_failed_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            } else {
+                return new SimpleDateFormat(getContext().getString(R.string.added_on_date_at_time),
+                        Locale.getDefault()).format(date);
+            }
+        } catch (IllegalArgumentException e) {
+            Timber.e(e);
+            return "";
         }
     }