From 98624a81c85976f0078adade19a53a479d52dac9 Mon Sep 17 00:00:00 2001 From: Grzegorz Orczykowski Date: Thu, 11 Jan 2018 22:50:34 +0100 Subject: [PATCH] Fixed IllegalArgumentException: Unterminated quote (#1775) --- .../android/provider/InstanceProvider.java | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 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 index 642f77a9715..fd40269884a 100644 --- 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 ""; } }