From 6c29aea7e0b7646249c0285e8b2b2519ec51e2eb Mon Sep 17 00:00:00 2001 From: ericz Date: Fri, 13 Nov 2026 23:21:21 +0100 Subject: [PATCH] backup and restore of bookmarks. --- lib/l10n/app_en.arb | 1 + lib/l10n/app_localizations.dart | 6 +++ lib/l10n/app_localizations_bg.dart | 3 ++ lib/l10n/app_localizations_cs.dart | 3 ++ lib/l10n/app_localizations_de.dart | 3 ++ lib/l10n/app_localizations_en.dart | 3 ++ lib/l10n/app_localizations_es.dart | 3 ++ lib/l10n/app_localizations_fr.dart | 3 ++ lib/l10n/app_localizations_hu.dart | 3 ++ lib/l10n/app_localizations_it.dart | 3 ++ lib/l10n/app_localizations_ja.dart | 3 ++ lib/l10n/app_localizations_ko.dart | 3 ++ lib/l10n/app_localizations_nl.dart | 3 ++ lib/l10n/app_localizations_pl.dart | 3 ++ lib/l10n/app_localizations_pt.dart | 3 ++ lib/l10n/app_localizations_ru.dart | 3 ++ lib/l10n/app_localizations_sk.dart | 3 ++ lib/l10n/app_localizations_sl.dart | 3 ++ lib/l10n/app_localizations_sv.dart | 3 ++ lib/l10n/app_localizations_uk.dart | 3 ++ lib/l10n/app_localizations_zh.dart | 3 ++ lib/screens/backup_restore_screen.dart | 5 +++ lib/services/backup_service.dart | 20 ++++++++-- test/services/backup_service_test.dart | 54 ++++++++++++++++++++++++++ untranslated.json | 19 +++++++++ 25 files changed, 159 insertions(+), 3 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index b6492f08..79cf0b68 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -229,6 +229,7 @@ "backupRestore_contactsDescription": "Contacts, per-contact filters and settings, groups, and message history", "backupRestore_discoveredContacts": "Discovered Contacts", "backupRestore_discoveredContactsDescription": "Discovered contacts and their saved details", + "backupRestore_bookmarks": "Bookmarks", "backupRestore_channels": "Channels", "backupRestore_channelsDescription": "Channels, channel filters, communities, and message history", "backupRestore_backup": "Create Backup", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index e2305161..62b3770d 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -1051,6 +1051,12 @@ abstract class AppLocalizations { /// **'Discovered contacts and their saved details'** String get backupRestore_discoveredContactsDescription; + /// No description provided for @backupRestore_bookmarks. + /// + /// In en, this message translates to: + /// **'Bookmarks'** + String get backupRestore_bookmarks; + /// No description provided for @backupRestore_channels. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 5a0ef5a5..b19c56e7 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -529,6 +529,9 @@ class AppLocalizationsBg extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Открити контакти и запазените им данни'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Канали'; diff --git a/lib/l10n/app_localizations_cs.dart b/lib/l10n/app_localizations_cs.dart index 5d519369..dc53f1e9 100644 --- a/lib/l10n/app_localizations_cs.dart +++ b/lib/l10n/app_localizations_cs.dart @@ -524,6 +524,9 @@ class AppLocalizationsCs extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Objevené kontakty a jejich uložené údaje'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanály'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 75746713..100d59d6 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -531,6 +531,9 @@ class AppLocalizationsDe extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Entdeckte Kontakte und ihre gespeicherten Details'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanäle'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index a43c26ca..b4545dbb 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -520,6 +520,9 @@ class AppLocalizationsEn extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Discovered contacts and their saved details'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Channels'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 86c1d0a3..a1474b7a 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -529,6 +529,9 @@ class AppLocalizationsEs extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Contactos descubiertos y sus detalles guardados'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Canales'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index a422f85b..366c487b 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -529,6 +529,9 @@ class AppLocalizationsFr extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Contacts découverts et leurs détails enregistrés'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Canaux'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index 8654fc3f..3db8a1bf 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -524,6 +524,9 @@ class AppLocalizationsHu extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Felfedezett névjegyek és mentett adataik'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Csatornák'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index 46679b46..15a93638 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -529,6 +529,9 @@ class AppLocalizationsIt extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Contatti scoperti e relativi dettagli salvati'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Canali'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index bc6a07bd..60bdc4d2 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -504,6 +504,9 @@ class AppLocalizationsJa extends AppLocalizations { @override String get backupRestore_discoveredContactsDescription => '検出された連絡先と保存済みの詳細'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'チャンネル'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index 28b89d94..c92a891f 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -505,6 +505,9 @@ class AppLocalizationsKo extends AppLocalizations { String get backupRestore_discoveredContactsDescription => '발견된 연락처와 저장된 세부 정보'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => '채널'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index 00d393e9..a56729e5 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -525,6 +525,9 @@ class AppLocalizationsNl extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Ontdekte contacten en hun opgeslagen gegevens'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanalen'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index c48c7ec6..b792f425 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -532,6 +532,9 @@ class AppLocalizationsPl extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Wykryte kontakty i ich zapisane dane'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanały'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index 8b7a13f8..249a9ac3 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -530,6 +530,9 @@ class AppLocalizationsPt extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Contatos descobertos e seus detalhes salvos'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Canais'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index 7f05ecb9..fc94febe 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -527,6 +527,9 @@ class AppLocalizationsRu extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Обнаруженные контакты и их сохранённые данные'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Каналы'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index 03d408f2..810f64b9 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -528,6 +528,9 @@ class AppLocalizationsSk extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Objavené kontakty a ich uložené údaje'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanály'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 4b2ee5b8..e3c9c0ca 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -526,6 +526,9 @@ class AppLocalizationsSl extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Odkriti kontakti in njihovi shranjeni podatki'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanali'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index b2d6ae13..16907662 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -526,6 +526,9 @@ class AppLocalizationsSv extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Upptäckta kontakter och deras sparade uppgifter'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Kanaler'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 6e0de8ef..cc67d9c0 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -526,6 +526,9 @@ class AppLocalizationsUk extends AppLocalizations { String get backupRestore_discoveredContactsDescription => 'Виявлені контакти та їхні збережені дані'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => 'Канали'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 2cd91f07..86af1b92 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -495,6 +495,9 @@ class AppLocalizationsZh extends AppLocalizations { @override String get backupRestore_discoveredContactsDescription => '已发现的联系人及其保存的详细信息'; + @override + String get backupRestore_bookmarks => 'Bookmarks'; + @override String get backupRestore_channels => '频道'; diff --git a/lib/screens/backup_restore_screen.dart b/lib/screens/backup_restore_screen.dart index 84b47d2a..c24962f7 100644 --- a/lib/screens/backup_restore_screen.dart +++ b/lib/screens/backup_restore_screen.dart @@ -201,6 +201,11 @@ class _BackupRestoreScreenState extends State { l10n.backupRestore_discoveredContacts, Icons.person_search_outlined, ), + _itemTile( + BackupItem.bookmarks, + l10n.backupRestore_bookmarks, + Icons.bookmark_border, + ), const Divider(height: 1, indent: 16), _groupTile( title: l10n.backupRestore_channels, diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart index ea0d5e36..b4645b80 100644 --- a/lib/services/backup_service.dart +++ b/lib/services/backup_service.dart @@ -49,6 +49,7 @@ const List _scopedPreferencePrefixes = [ ..._contactPreferencePrefixes, ..._channelPreferencePrefixes, 'discovered_contacts', + 'message_bookmarks_', ]; enum BackupSection { @@ -75,6 +76,7 @@ enum BackupItem { contactGroups, contactHistory, discoveredContacts, + bookmarks, channels, channelFilters, ipfsKey, @@ -1055,7 +1057,8 @@ class BackupService { BackupItem.perContactSettings || BackupItem.contactGroups || BackupItem.contactHistory => BackupSection.contacts, - BackupItem.discoveredContacts => BackupSection.discoveredContacts, + BackupItem.discoveredContacts || + BackupItem.bookmarks => BackupSection.discoveredContacts, BackupItem.channels || BackupItem.channelFilters || BackupItem.channelSettings || @@ -1108,6 +1111,10 @@ class BackupService { key.startsWith('discovered_contacts$devicePrefix')) { return true; } + if (items.contains(BackupItem.bookmarks) && + key.startsWith('message_bookmarks_$devicePrefix')) { + return true; + } if (items.contains(BackupItem.channels) && (key.startsWith('channels$devicePrefix') || key.startsWith('channel_slot_ids_$devicePrefix'))) { @@ -1156,6 +1163,7 @@ class BackupService { case BackupSection.discoveredContacts: return _startsWithScopedPrefix(key, const [ 'discovered_contacts', + 'message_bookmarks_', ], devicePrefix); case BackupSection.channels: return key.startsWith('message_filter_') || @@ -1348,7 +1356,10 @@ class BackupService { if (sourcePrefix.isEmpty || destinationPrefix.isEmpty) return key; final prefixes = switch (section) { BackupSection.contacts => _contactPreferencePrefixes, - BackupSection.discoveredContacts => const ['discovered_contacts'], + BackupSection.discoveredContacts => const [ + 'discovered_contacts', + 'message_bookmarks_', + ], BackupSection.channels => _channelPreferencePrefixes, _ => const [], }; @@ -1373,7 +1384,10 @@ class BackupService { if (devicePrefix.isEmpty) return false; final prefixes = switch (section) { BackupSection.contacts => _contactPreferencePrefixes, - BackupSection.discoveredContacts => const ['discovered_contacts'], + BackupSection.discoveredContacts => const [ + 'discovered_contacts', + 'message_bookmarks_', + ], BackupSection.channels => _channelPreferencePrefixes, _ => const [], }; diff --git a/test/services/backup_service_test.dart b/test/services/backup_service_test.dart index ad6e46ce..ff7d79ef 100644 --- a/test/services/backup_service_test.dart +++ b/test/services/backup_service_test.dart @@ -347,6 +347,7 @@ void main() { BackupItem.contactGroups, BackupItem.contactHistory, BackupItem.discoveredContacts, + BackupItem.bookmarks, BackupItem.channelFilters, BackupItem.channelSettings, BackupItem.communities, @@ -405,4 +406,57 @@ void main() { ); }); }); + + test( + 'backs up and restores bookmarks separately from discovered contacts', + () async { + SharedPreferences.setMockInitialValues({}); + PrefsManager.reset(); + await PrefsManager.initialize(); + addTearDown(PrefsManager.reset); + final connector = MeshCoreConnector(); + addTearDown(connector.dispose); + await connector.connectReview(); + final settingsService = AppSettingsService(); + addTearDown(settingsService.dispose); + final prefix = connector.selfPublicKeyHex.substring(0, 10); + final bookmarkKey = 'message_bookmarks_$prefix'; + final discoveredKey = 'discovered_contacts_$prefix'; + final bookmarks = [ + {'messageId': 'saved', 'text': 'saved message'}, + ]; + await PrefsManager.instance.setString(bookmarkKey, jsonEncode(bookmarks)); + await PrefsManager.instance.setString(discoveredKey, 'keep discovered'); + + final backup = await const BackupService().createBackup( + items: {BackupItem.bookmarks}, + connector: connector, + settings: settingsService.settings, + password: '', + ); + final payload = jsonDecode(backup) as Map; + expect(payload['items'], [BackupItem.bookmarks.name]); + final discoveredSection = + (payload['sections'] as Map)['discoveredContacts'] + as Map; + final preferences = + discoveredSection['preferences'] as Map; + expect(preferences[bookmarkKey], bookmarks); + expect(preferences, isNot(contains(discoveredKey))); + + await PrefsManager.instance.setString(bookmarkKey, '[]'); + await const BackupService().restoreBackup( + contents: backup, + password: '', + items: {BackupItem.bookmarks}, + connector: connector, + appSettingsService: settingsService, + ); + expect( + jsonDecode(PrefsManager.instance.getString(bookmarkKey)!), + bookmarks, + ); + expect(PrefsManager.instance.getString(discoveredKey), 'keep discovered'); + }, + ); } diff --git a/untranslated.json b/untranslated.json index 31216ce7..bbce6900 100644 --- a/untranslated.json +++ b/untranslated.json @@ -1,5 +1,6 @@ { "bg": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -11,6 +12,7 @@ ], "cs": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -22,6 +24,7 @@ ], "de": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -33,6 +36,7 @@ ], "es": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -44,6 +48,7 @@ ], "fr": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -55,6 +60,7 @@ ], "hu": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -66,6 +72,7 @@ ], "it": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -77,6 +84,7 @@ ], "ja": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -88,6 +96,7 @@ ], "ko": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -99,6 +108,7 @@ ], "nl": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -110,6 +120,7 @@ ], "pl": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -121,6 +132,7 @@ ], "pt": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -132,6 +144,7 @@ ], "pt_PT": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -143,6 +156,7 @@ ], "ru": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -154,6 +168,7 @@ ], "sk": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -165,6 +180,7 @@ ], "sl": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -176,6 +192,7 @@ ], "sv": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -187,6 +204,7 @@ ], "uk": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks", @@ -198,6 +216,7 @@ ], "zh": [ + "backupRestore_bookmarks", "chat_bookmark", "chat_removeBookmark", "chat_showBookmarks",