From 14ed8c7ce3266e4b5849a9816c8eba2f3b14d781 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sat, 21 Nov 2020 00:44:12 +0100 Subject: [PATCH] Don't remove new settings during migration if already present --- service/src/main/kotlin/org/microg/nlp/service/Preferences.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/service/src/main/kotlin/org/microg/nlp/service/Preferences.kt b/service/src/main/kotlin/org/microg/nlp/service/Preferences.kt index 15733ab..f5a066c 100644 --- a/service/src/main/kotlin/org/microg/nlp/service/Preferences.kt +++ b/service/src/main/kotlin/org/microg/nlp/service/Preferences.kt @@ -63,6 +63,7 @@ class Preferences(private val context: Context) { val fromOldSettings = oldPreferences.getStringSetCompat(key) if (fromOldSettings != null) { var newSettings: MutableSet = mutableSetOf() + newSettings.addAll(preferences.getStringSetCompat(key).orEmpty()) for (oldBackend in fromOldSettings) { // Get package name and sha1 val parts = oldBackend.split("/".toRegex()).dropLastWhile(String::isEmpty).toTypedArray()