Remove support for external storage and raise target SDK to 31 (#1863)

2 files changed, 19 insertions, 4 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
index 5d61e75b..b90856b1 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
@@ -26,6 +26,7 @@ fun runMigrations(filesDirPath: String, sharedPrefs: SharedPreferences, gitSetti
   migrateToSshKey(filesDirPath, sharedPrefs)
   migrateToClipboardHistory(sharedPrefs)
   migrateToDiceware(sharedPrefs)
+  removeExternalStorageProperties(sharedPrefs)
 }
 
 private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences, gitSettings: GitSettings) {
@@ -132,3 +133,18 @@ private fun migrateToDiceware(sharedPrefs: SharedPreferences) {
     }
   }
 }
+
+private fun removeExternalStorageProperties(prefs: SharedPreferences) {
+  logcat(TAG, INFO) { "Removing preferences related to external storage" }
+  prefs.edit {
+    if (prefs.contains(PreferenceKeys.GIT_EXTERNAL)) {
+      if (prefs.getBoolean(PreferenceKeys.GIT_EXTERNAL, false)) {
+        putBoolean(PreferenceKeys.GIT_EXTERNAL_MIGRATED, true)
+      }
+      remove(PreferenceKeys.GIT_EXTERNAL)
+    }
+    if (prefs.contains(PreferenceKeys.GIT_EXTERNAL_REPO)) {
+      remove(PreferenceKeys.GIT_EXTERNAL_REPO)
+    }
+  }
+}
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
index 6168cfee..152275d6 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
@@ -8,7 +8,6 @@ package dev.msfjarvis.aps.util.settings
 object PreferenceKeys {
 
   const val APP_THEME = "app_theme"
-  const val APP_VERSION = "app_version"
   const val AUTOFILL_ENABLE = "autofill_enable"
   const val BIOMETRIC_AUTH = "biometric_auth"
   @Deprecated(
@@ -26,8 +25,11 @@ object PreferenceKeys {
   const val GIT_CONFIG = "git_config"
   const val GIT_CONFIG_AUTHOR_EMAIL = "git_config_user_email"
   const val GIT_CONFIG_AUTHOR_NAME = "git_config_user_name"
+  @Deprecated(message = "We're removing support for external storage")
   const val GIT_EXTERNAL = "git_external"
+  @Deprecated(message = "We're removing support for external storage")
   const val GIT_EXTERNAL_REPO = "git_external_repo"
+  const val GIT_EXTERNAL_MIGRATED = "git_external_migrated"
   const val GIT_REMOTE_AUTH = "git_remote_auth"
   const val GIT_REMOTE_KEY_TYPE = "git_remote_key_type"
 
@@ -50,10 +52,7 @@ object PreferenceKeys {
   const val OREO_AUTOFILL_CUSTOM_PUBLIC_SUFFIXES = "oreo_autofill_custom_public_suffixes"
   const val OREO_AUTOFILL_DEFAULT_USERNAME = "oreo_autofill_default_username"
   const val OREO_AUTOFILL_DIRECTORY_STRUCTURE = "oreo_autofill_directory_structure"
-  const val PREF_KEY_CUSTOM_DICT = "pref_key_custom_dict"
-  const val PREF_KEY_IS_CUSTOM_DICT = "pref_key_is_custom_dict"
   const val PREF_KEY_PWGEN_TYPE = "pref_key_pwgen_type"
-  const val PREF_SELECT_EXTERNAL = "pref_select_external"
   const val REPOSITORY_INITIALIZED = "repository_initialized"
   const val REPO_CHANGED = "repo_changed"
   const val SEARCH_ON_START = "search_on_start"