Cancel Google sheet form upload when activity destroyed (getodk#1831)

manglide · Apr 30, 2018 · 735f6f8 · 735f6f8
1 parent b53d492
commit 735f6f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/...ct_app/src/main/java/org/odk/collect/android/activities/GoogleSheetsUploaderActivity.java b/...ct_app/src/main/java/org/odk/collect/android/activities/GoogleSheetsUploaderActivity.java
@@ -265,8 +265,12 @@ protected void onStop() {
     @Override
     protected void onDestroy() {
         if (instanceGoogleSheetsUploader != null) {
+            if (!instanceGoogleSheetsUploader.isCancelled()) {
+                instanceGoogleSheetsUploader.cancel(true);
+            }
             instanceGoogleSheetsUploader.setUploaderListener(null);
         }
+        finish();
         super.onDestroy();
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java b/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java
@@ -243,6 +243,10 @@ private void insertRow(TreeElement element, String parentKey, String key, File i
         List<Object> columnTitles = getColumnTitles(element);
         ensureNumberOfColumnsIsValid(columnTitles.size());
 
+        if (isCancelled()) {
+            throw new UploadException(Collect.getInstance().getString(R.string.instance_upload_cancelled));
+        }
+
         try {
             List<List<Object>> sheetCells = getSheetCells(sheetTitle);
             if (sheetCells != null && !sheetCells.isEmpty()) { // we are editing an existed sheet
@@ -264,6 +268,11 @@ private void insertRow(TreeElement element, String parentKey, String key, File i
             }
 
             HashMap<String, String> answers = getAnswers(element, instanceFile, parentKey, key);
+
+            if (isCancelled()) {
+                throw new UploadException(Collect.getInstance().getString(R.string.instance_upload_cancelled));
+            }
+
             if (shouldRowBeInserted(answers)) {
                 sheetsHelper.insertRow(spreadsheet.getSpreadsheetId(), sheetTitle,
                         new ValueRange().setValues(Collections.singletonList(prepareListOfValues(sheetCells.get(0), columnTitles, answers))));

diff --git a/collect_app/src/main/res/values/strings.xml b/collect_app/src/main/res/values/strings.xml
@@ -584,4 +584,5 @@
     <string name="no_columns_to_upload">No columns found in the form to upload.</string>
     <string name="cannot_create_directory">Cannot create directory: %s</string>
     <string name="not_a_directory">%s exists, but is not a directory</string>
+    <string name="instance_upload_cancelled">Instance upload cancelled</string>
 </resources>