Resolved crash when downloading forms from Google Server (getodk#2169)

rral0 · May 14, 2018 · eb3c9ee · eb3c9ee
1 parent fb4bd52
commit eb3c9ee
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GoogleDriveActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GoogleDriveActivity.java
@@ -491,17 +491,6 @@ public void taskComplete(HashMap<String, Object> results) {
 
     }
 
-    @Override
-    protected void onPause() {
-        if (retrieveDriveFileContentsAsyncTask != null) {
-            retrieveDriveFileContentsAsyncTask.setTaskListener(null);
-        }
-        if (getFileTask != null) {
-            getFileTask.setGoogleDriveFormDownloadListener(null);
-        }
-        super.onPause();
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -546,6 +535,24 @@ protected void onStop() {
         super.onStop();
     }
 
+    @Override
+    protected void onDestroy() {
+        if (retrieveDriveFileContentsAsyncTask != null) {
+            if (!retrieveDriveFileContentsAsyncTask.isCancelled()) {
+                retrieveDriveFileContentsAsyncTask.cancel(true);
+            }
+            retrieveDriveFileContentsAsyncTask.setTaskListener(null);
+        }
+        if (getFileTask != null) {
+            if (!getFileTask.isCancelled()) {
+                getFileTask.cancel(true);
+            }
+            getFileTask.setGoogleDriveFormDownloadListener(null);
+        }
+        finish();
+        super.onDestroy();
+    }
+
     public void listFiles(String dir, String query) {
         setProgressBarIndeterminateVisibility(true);
         adapter = null;