Merge branch 'main' into dev-dbDevicePrefix

lib/storage/channel_message_store.dart

@@ -61,6 +61,9 @@ class ChannelMessageStore {
         jsonString = legacyJsonString;
       }
     }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/channel_settings_store.dart

@@ -20,7 +20,7 @@ class ChannelSettingsStore {
     final prefs = PrefsManager.instance;
     final key = '$keyFor$channelIndex';
     final oldKey = '$_keyPrefix$channelIndex';
-    bool? enabled = prefs.getBool(key);
+    bool? enabled = prefs.getBool(oldKey);
     if (enabled == null) {
       // Attempt migration from legacy unscoped key on first load
       enabled = prefs.getBool(oldKey);

lib/storage/community_store.dart

@@ -39,6 +39,9 @@ class CommunityStore {
       }
     }
 
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/contact_group_store.dart

@@ -31,6 +31,9 @@ class ContactGroupStore {
         jsonString = legacyJsonString;
       }
     }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/contact_store.dart

@@ -33,6 +33,9 @@ class ContactStore {
         jsonString = legacyJsonString;
       }
     }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/message_store.dart

@@ -50,6 +50,9 @@ class MessageStore {
       }
     }
 
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/unread_store.dart

@@ -45,6 +45,9 @@ class UnreadStore {
         jsonString = legacyJsonString;
       }
     }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return {};
     }