From 5822f98bbbc3b96a90ff09551de8252ca18bca22 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Tue, 15 Aug 2023 20:23:33 +0200
Subject: Migrate layouts preferences

The new `layouts` preference replaces three previous preferences:

    layout
    second_layout
    custom_layout

Add a preference migration function, which first migration is to
migrate layouts into the new preference.

The migration must also be called from the SettingsActivity as it might
use a different preference store due to the boot-aware preference copy.
---
 srcs/juloo.keyboard2/SettingsActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'srcs/juloo.keyboard2/SettingsActivity.java')

diff --git a/srcs/juloo.keyboard2/SettingsActivity.java b/srcs/juloo.keyboard2/SettingsActivity.java
index 6fd050c..d053552 100644
--- a/srcs/juloo.keyboard2/SettingsActivity.java
+++ b/srcs/juloo.keyboard2/SettingsActivity.java
@@ -16,7 +16,12 @@ public class SettingsActivity extends PreferenceActivity
     super.onCreate(savedInstanceState);
     // The preferences can't be read when in direct-boot mode. Avoid crashing
     // and don't allow changing the settings.
-    try { getPreferenceManager().getSharedPreferences(); }
+    // Run the config migration on this prefs as it might be different from the
+    // one used by the keyboard, which have been migrated.
+    try
+    {
+      Config.migrate(getPreferenceManager().getSharedPreferences());
+    }
     catch (Exception _e) { fallbackEncrypted(); return; }
     addPreferencesFromResource(R.xml.settings);
   }
-- 
cgit v1.2.3