From 1ce2e31b0240894414e63754d6f1f95e84a24c56 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 16 Sep 2020 17:27:17 -0500
Subject: [PATCH] Update timestamp after enabling drive backups

---
 .../org/tasks/preferences/MainPreferences.kt    | 17 -----------------
 .../tasks/preferences/PreferencesViewModel.kt   |  3 +--
 .../org/tasks/preferences/fragments/Backups.kt  |  6 ++++++
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/tasks/preferences/MainPreferences.kt b/app/src/main/java/org/tasks/preferences/MainPreferences.kt
index 305655923..8fdc5d249 100644
--- a/app/src/main/java/org/tasks/preferences/MainPreferences.kt
+++ b/app/src/main/java/org/tasks/preferences/MainPreferences.kt
@@ -2,20 +2,15 @@ package org.tasks.preferences
 
 import android.app.Activity
 import android.content.Intent
-import android.os.Bundle
-import androidx.activity.viewModels
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
-import org.tasks.drive.DriveLoginActivity
 import org.tasks.jobs.WorkManager
 import org.tasks.preferences.fragments.MainSettingsFragment
 import org.tasks.preferences.fragments.REQUEST_CALDAV_SETTINGS
-import org.tasks.preferences.fragments.REQUEST_DRIVE_BACKUP
 import org.tasks.preferences.fragments.REQUEST_GOOGLE_TASKS
 import org.tasks.sync.SyncAdapters
 import org.tasks.ui.Toaster
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -25,18 +20,10 @@ class MainPreferences : BasePreferences() {
     @Inject lateinit var workManager: WorkManager
     @Inject lateinit var toaster: Toaster
 
-    private val viewModel: PreferencesViewModel by viewModels()
-
     override fun getRootTitle() = R.string.TLA_menu_settings
 
     override fun getRootPreference() = MainSettingsFragment()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Timber.d("viewModel=$viewModel")
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CALDAV_SETTINGS) {
             if (resultCode == RESULT_OK) {
@@ -50,10 +37,6 @@ class MainPreferences : BasePreferences() {
             } else {
                 data?.getStringExtra(GtasksLoginActivity.EXTRA_ERROR)?.let { toaster.longToast(it) }
             }
-        } else if (requestCode == REQUEST_DRIVE_BACKUP) {
-            if (resultCode != Activity.RESULT_OK) {
-                data?.getStringExtra(DriveLoginActivity.EXTRA_ERROR)?.let { toaster.longToast(it) }
-            }
         } else {
             super.onActivityResult(requestCode, resultCode, data)
         }
diff --git a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
index 174c3fd87..2df148431 100644
--- a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
+++ b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
@@ -40,8 +40,7 @@ class PreferencesViewModel @ViewModelInject constructor(
             return if (enabled) account else null
         }
 
-
-    private fun updateDriveBackup() = viewModelScope.launch {
+    fun updateDriveBackup() = viewModelScope.launch {
         if (driveAccount.isNullOrBlank()) {
             lastDriveBackup.value = null
             return@launch
diff --git a/app/src/main/java/org/tasks/preferences/fragments/Backups.kt b/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
index 4c19c4bf3..143db0190 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
@@ -156,6 +156,12 @@ class Backups : InjectingPreferenceFragment() {
                         .show(parentFragmentManager, FRAG_TAG_IMPORT_TASKS)
                 }
             }
+        } else if (requestCode == REQUEST_DRIVE_BACKUP) {
+            if (resultCode == RESULT_OK) {
+                viewModel.updateDriveBackup()
+            } else {
+                data?.getStringExtra(DriveLoginActivity.EXTRA_ERROR)?.let { toaster.longToast(it) }
+            }
         } else if (requestCode == REQUEST_BACKUP_NOW) {
             if (resultCode == RESULT_OK) {
                 viewModel.updateLocalBackup()