From 7bfd33902199d307f82538558f10da8549caf530 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 2 Dec 2020 15:16:19 -0600
Subject: [PATCH] Fix handling Google Drive 404 errors

---
 .../main/java/org/tasks/drive/DriveInvoker.kt | 12 ++++++++---
 .../main/java/org/tasks/jobs/DriveUploader.kt | 20 ++-----------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/tasks/drive/DriveInvoker.kt b/app/src/main/java/org/tasks/drive/DriveInvoker.kt
index 05534f0ef..702cdd1e8 100644
--- a/app/src/main/java/org/tasks/drive/DriveInvoker.kt
+++ b/app/src/main/java/org/tasks/drive/DriveInvoker.kt
@@ -9,6 +9,7 @@ import com.google.api.services.drive.Drive
 import com.google.api.services.drive.model.File
 import com.todoroo.astrid.backup.BackupConstants
 import com.todoroo.astrid.gtasks.api.HttpCredentialsAdapter
+import com.todoroo.astrid.gtasks.api.HttpNotFoundException
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.DebugNetworkInterceptor
 import org.tasks.files.FileHelper
@@ -28,13 +29,18 @@ class DriveInvoker(
                     .build()
 
     @Throws(IOException::class)
-    suspend fun getFile(folderId: String?): File? {
-        return execute(service.files()[folderId].setFields("id, trashed"))
+    suspend fun getFile(folderId: String?): File? = try {
+        execute(service.files()[folderId].setFields("id, trashed"))
+    } catch (ignored: HttpNotFoundException) {
+        null
     }
 
     @Throws(IOException::class)
     suspend fun delete(file: File) {
-        execute(service.files().delete(file.id))
+        try {
+            execute(service.files().delete(file.id))
+        } catch (ignored: HttpNotFoundException) {
+        }
     }
 
     @Throws(IOException::class)
diff --git a/app/src/main/java/org/tasks/jobs/DriveUploader.kt b/app/src/main/java/org/tasks/jobs/DriveUploader.kt
index 6b64e3c77..1380a1559 100644
--- a/app/src/main/java/org/tasks/jobs/DriveUploader.kt
+++ b/app/src/main/java/org/tasks/jobs/DriveUploader.kt
@@ -48,17 +48,7 @@ class DriveUploader @WorkerInject constructor(
                 drive
                         .getFilesByPrefix(folder.id, "auto.")
                         .drop(BackupWork.DAYS_TO_KEEP_BACKUP)
-                        .forEach {
-                            try {
-                                drive.delete(it)
-                            } catch (e: GoogleJsonResponseException) {
-                                if (e.statusCode == 404) {
-                                    Timber.e(e)
-                                } else {
-                                    throw e
-                                }
-                            }
-                        }
+                        .forEach { drive.delete(it) }
             }
             Result.success()
         } catch (e: SocketTimeoutException) {
@@ -102,13 +92,7 @@ class DriveUploader @WorkerInject constructor(
         val folderId = preferences.getStringValue(R.string.p_google_drive_backup_folder)
         var file: File? = null
         if (!isNullOrEmpty(folderId)) {
-            try {
-                file = drive.getFile(folderId)
-            } catch (e: GoogleJsonResponseException) {
-                if (e.statusCode != 404) {
-                    throw e
-                }
-            }
+            file = drive.getFile(folderId)
         }
         return if (file == null || file.trashed) drive.createFolder(FOLDER_NAME) else file
     }