From ddf9f79b182feff8c9f7f592709abea416fc7254 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 8 Sep 2020 15:20:13 -0500 Subject: [PATCH] Add Android Backup Service settings * Add option to disable upload to backup service * Display date of last upload --- app/src/main/AndroidManifest.xml | 1 + .../java/org/tasks/backup/TasksBackupAgent.kt | 29 +++++++++++++++++-- .../org/tasks/backup/TasksJsonImporter.kt | 1 + .../tasks/preferences/fragments/Backups.kt | 15 +++++++++- app/src/main/res/values/keys.xml | 2 ++ app/src/main/res/values/strings.xml | 5 ++++ app/src/main/res/xml/preferences_backups.xml | 20 ++++++++++++- 7 files changed, 68 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a1087a69..5c84ef813 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -123,6 +123,7 @@ show_whats_new just_updated clicked_rate + backups_android_backup_enabled + backups_android_backup_last cv whats_new diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0dbff656..18b6ad1f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -637,4 +637,9 @@ File %1$s contained %2$s.\n\n Reset sort order Full access to Tasks database Account not found + Android Backup Service + You must also opt in to backup service through your device settings. Not all devices provide backup service. + Last backup: %s + never + Device settings diff --git a/app/src/main/res/xml/preferences_backups.xml b/app/src/main/res/xml/preferences_backups.xml index f09c7a347..371f61456 100644 --- a/app/src/main/res/xml/preferences_backups.xml +++ b/app/src/main/res/xml/preferences_backups.xml @@ -1,5 +1,6 @@ - + + + + + + + + + + + \ No newline at end of file