Rework clear clipboard feature (#1295)

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

2 files changed, 18 insertions, 0 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 fe855f3f..157a2665 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
@@ -24,6 +24,7 @@ fun runMigrations(context: Context) {
     migrateToGitUrlBasedConfig(sharedPrefs)
     migrateToHideAll(sharedPrefs)
     migrateToSshKey(context, sharedPrefs)
+    migrateToClipboardHistory(sharedPrefs)
 }
 
 private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences) {
@@ -112,3 +113,15 @@ private fun migrateToSshKey(context: Context, sharedPrefs: SharedPreferences) {
         }
     }
 }
+
+private fun migrateToClipboardHistory(sharedPrefs: SharedPreferences) {
+    if (sharedPrefs.contains(PreferenceKeys.CLEAR_CLIPBOARD_20X)) {
+        sharedPrefs.edit {
+            putBoolean(
+                PreferenceKeys.CLEAR_CLIPBOARD_HISTORY,
+                sharedPrefs.getBoolean(PreferenceKeys.CLEAR_CLIPBOARD_20X, false)
+            )
+            remove(PreferenceKeys.CLEAR_CLIPBOARD_20X)
+        }
+    }
+}
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 930a5427..084b70c2 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
@@ -11,7 +11,12 @@ object PreferenceKeys {
     const val APP_VERSION = "app_version"
     const val AUTOFILL_ENABLE = "autofill_enable"
     const val BIOMETRIC_AUTH = "biometric_auth"
+    @Deprecated(
+        message = "Use CLEAR_CLIPBOARD_HISTORY instead",
+        replaceWith = ReplaceWith("PreferenceKeys.CLEAR_CLIPBOARD_HISTORY"),
+    )
     const val CLEAR_CLIPBOARD_20X = "clear_clipboard_20x"
+    const val CLEAR_CLIPBOARD_HISTORY = "clear_clipboard_history"
     const val CLEAR_SAVED_PASS = "clear_saved_pass"
     const val COPY_ON_DECRYPT = "copy_on_decrypt"
     const val ENABLE_DEBUG_LOGGING = "enable_debug_logging"