Update error message for missing submission URL in Google Sheets uplo…

…ader (getodk#2648)
razorahul · Oct 23, 2018 · 91812dc · 91812dc
1 parent f0a43be
commit 91812dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/UrlUtils.java b/collect_app/src/main/java/org/odk/collect/android/utilities/UrlUtils.java
@@ -30,7 +30,10 @@ private UrlUtils() {
     public static String getSpreadsheetID(String urlString) throws BadUrlException {
         // now parse the url string if we have one
         final String googleHeader = "docs.google.com/spreadsheets/d/";
-        if (urlString == null || urlString.length() < googleHeader.length()) {
+        if (urlString == null || urlString.isEmpty()) {
+            throw new BadUrlException(
+                    Collect.getInstance().getString(R.string.missing_submission_url));
+        } else if (urlString.length() < googleHeader.length()) {
             throw new BadUrlException(
                     Collect.getInstance().getString(R.string.invalid_sheet_id, urlString));
         } else {

diff --git a/collect_app/src/main/res/values/strings.xml b/collect_app/src/main/res/values/strings.xml
@@ -299,6 +299,7 @@
     <string name="send_in_progress">Background send running, please try again shortly</string>
     <string name="sheets_max_columns">Max number of columns is 255, your form has %s. Unable to upload to spreadsheet.</string>
     <string name="invalid_sheet_id">invalid sheet id: %1$s</string>
+    <string name="missing_submission_url">Missing submission URL</string>
     <string name="google_sheets_access_denied">Access denied. Please make sure the spreadsheet owner has granted you edit permission.</string>
     <string name="google_sheets_missing_columns">Spreadsheet is missing the following columns: %1$s</string>
     <string name="password_error_whitespace">Leading or trailing whitespace not allowed in passwords</string>