Merge branch 'main' into dev-dbDevicePrefix

lib/screens/channels_screen.dart

@@ -54,6 +54,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   @override
   void initState() {
     super.initState();
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       context.read<MeshCoreConnector>().getChannels();
       _loadCommunities();

lib/screens/community_qr_scanner_screen.dart

@@ -51,6 +51,9 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
       _isProcessing = true;
     });
 
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+
     try {
       // Parse the community data
       final community = Community.fromQrData(const Uuid().v4(), data);
@@ -209,6 +212,8 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
     bool addPublicChannel,
   ) async {
     // Save community to local storage
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
     await _communityStore.addCommunity(community);
 
     // Optionally add the community public channel to the device

lib/storage/channel_message_store.dart

@@ -48,7 +48,7 @@ class ChannelMessageStore {
     final key = '$keyFor$channelIndex';
     final oldKey = '$_keyPrefix$channelIndex';
 
-    String? jsonString = prefs.getString(oldKey);
+    String? jsonString = prefs.getString(key);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(oldKey);

lib/storage/channel_order_store.dart

@@ -26,7 +26,7 @@ class ChannelOrderStore {
       return [];
     }
     final prefs = PrefsManager.instance;
-    String? jsonString = prefs.getString(_keyPrefix);
+    String? jsonString = prefs.getString(keyFor);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(_keyPrefix);
@@ -42,6 +42,7 @@ class ChannelOrderStore {
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }
+
     try {
       final decoded = jsonDecode(jsonString);
       if (decoded is List) {

lib/storage/channel_store.dart

@@ -19,7 +19,7 @@ class ChannelStore {
       return [];
     }
     final prefs = PrefsManager.instance;
-    String? jsonString = prefs.getString(_keyPrefix);
+    String? jsonString = prefs.getString(keyFor);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(_keyPrefix);
@@ -33,9 +33,6 @@ class ChannelStore {
       }
     }
 
-    if (jsonString == null || jsonString.isEmpty) {
-      jsonString = prefs.getString(keyFor);
-    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/community_store.dart

@@ -25,7 +25,7 @@ class CommunityStore {
       return [];
     }
     final prefs = PrefsManager.instance;
-    String? jsonString = prefs.getString(_keyPrefix);
+    String? jsonString = prefs.getString(keyFor);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(_keyPrefix);
@@ -38,6 +38,7 @@ class CommunityStore {
         jsonString = legacyJsonString;
       }
     }
+
     if (jsonString == null || jsonString.isEmpty) {
       jsonString = prefs.getString(keyFor);
     }

lib/storage/contact_group_store.dart

@@ -18,7 +18,7 @@ class ContactGroupStore {
       return [];
     }
     final prefs = PrefsManager.instance;
-    String? jsonString = prefs.getString(_keyPrefix);
+    String? jsonString = prefs.getString(keyFor);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(_keyPrefix);

lib/storage/message_store.dart

@@ -49,6 +49,7 @@ class MessageStore {
         jsonString = legacyJsonString;
       }
     }
+
     if (jsonString == null || jsonString.isEmpty) {
       jsonString = prefs.getString(keyFor);
     }

lib/storage/unread_store.dart

@@ -32,7 +32,7 @@ class UnreadStore {
       return {};
     }
     final prefs = PrefsManager.instance;
-    String? jsonString = prefs.getString(_keyPrefix);
+    String? jsonString = prefs.getString(keyFor);
     if (jsonString == null || jsonString.isEmpty) {
       // Attempt migration from legacy unscoped key on first load
       final legacyJsonString = prefs.getString(_keyPrefix);