feat(AccountSwitcher): add automatic migration to shared prefs

Author: zt64

plugin/AccountSwitcher/build.gradle.kts

@@ -1,8 +1,11 @@
-version = "1.3.0"
+version = "1.3.1"
 description = "Adds the ability to quickly switch accounts"
 
 aliucord.changelog.set(
     """
+    # 1.3.1
+    * Added automatic migration for accounts from the old storage format to the new one.
+    
     # 1.3.0
     * Redesigned how accounts are stored, now using a SharedPreferences backed map, which allows for better security and less error prone code.
     * Added helper text to explain how to access the switcher and add accounts.

plugin/AccountSwitcher/src/main/kotlin/AccountSwitcher.kt

@@ -2,6 +2,7 @@
 
 import accountswitcher.SharedPreferencesBackedMap
 import accountswitcher.SwitcherPage
+import accountswitcher.migrate
 import accountswitcher.settings.PluginSettings
 import android.content.Context
 import com.aliucord.Utils
@@ -21,6 +22,8 @@ class AccountSwitcher : Plugin() {
     }
 
     override fun start(context: Context) {
+        migrate(settings)
+
         patcher.instead<WidgetSettings>("showLogoutDialog", Context::class.java) {
             Utils.openPageWithProxy(Utils.appActivity, SwitcherPage())
         }

plugin/AccountSwitcher/src/main/kotlin/accountswitcher/Util.kt

@@ -2,8 +2,10 @@
 
 package accountswitcher
 
+import AccountSwitcher.Companion.accounts
 import android.content.Context
 import com.aliucord.Http
+import com.aliucord.api.SettingsAPI
 import com.aliucord.utils.GsonUtils
 import com.aliucord.utils.GsonUtils.fromJson
 import com.aliucord.utils.GsonUtils.toJson
@@ -12,9 +14,10 @@ import com.discord.utilities.rest.RestAPI
 import com.google.gson.reflect.TypeToken
 import java.lang.reflect.Type
 
+private val type: Type = object : TypeToken<ArrayList<Account>>() {}.type
+
 class SharedPreferencesBackedMap(context: Context) : AbstractMutableMap<Long, Account>() {
     private val prefs = context.getSharedPreferences("AccountSwitcher", Context.MODE_PRIVATE)
-    private val type: Type = object : TypeToken<ArrayList<Account>>() {}.type
 
     private fun getMap(): MutableMap<Long, Account> {
         val json = prefs.getString("accounts", "[]")
@@ -55,6 +58,16 @@ class SharedPreferencesBackedMap(context: Context) : AbstractMutableMap<Long, Ac
     }
 }
 
+fun migrate(oldSettings: SettingsAPI) {
+    if (!oldSettings.exists("accounts")) return
+
+    oldSettings
+        .getObject("accounts", ArrayList<Account>(), type)
+        .forEach { accounts[it.id] = it }
+
+    oldSettings.resetSettings()
+}
+
 fun fetchUser(token: String): MeUser? = try {
     Http
         .Request("https://discord.com/api/v9/users/@me")