backup and restore of bookmarks.

This commit is contained in:
ericz committed 2026-11-13 23:21:21 +01:00
1 parent f32300797e
commit 6c29aea7e0
25 files changed
+159 -3

No files matched your search

+1
View File
@@ -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",
+6
View File
@@ -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:
+3
View File
@@ -529,6 +529,9 @@ class AppLocalizationsBg extends AppLocalizations {
String get backupRestore_discoveredContactsDescription =>
'Открити контакти и запазените им данни';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => 'Канали';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -504,6 +504,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get backupRestore_discoveredContactsDescription => '検出された連絡先と保存済みの詳細';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => 'チャンネル';
+3
View File
@@ -505,6 +505,9 @@ class AppLocalizationsKo extends AppLocalizations {
String get backupRestore_discoveredContactsDescription =>
'발견된 연락처와 저장된 세부 정보';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => '채널';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -527,6 +527,9 @@ class AppLocalizationsRu extends AppLocalizations {
String get backupRestore_discoveredContactsDescription =>
'Обнаруженные контакты и их сохранённые данные';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => 'Каналы';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -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';
+3
View File
@@ -526,6 +526,9 @@ class AppLocalizationsUk extends AppLocalizations {
String get backupRestore_discoveredContactsDescription =>
'Виявлені контакти та їхні збережені дані';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => 'Канали';
+3
View File
@@ -495,6 +495,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get backupRestore_discoveredContactsDescription => '已发现的联系人及其保存的详细信息';
@override
String get backupRestore_bookmarks => 'Bookmarks';
@override
String get backupRestore_channels => '频道';
+5
View File
@@ -201,6 +201,11 @@ class _BackupRestoreScreenState extends State<BackupRestoreScreen> {
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,
+17 -3
View File
@@ -49,6 +49,7 @@ const List<String> _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 <String>[],
};
@@ -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 <String>[],
};
+54
View File
@@ -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<String, dynamic>;
expect(payload['items'], [BackupItem.bookmarks.name]);
final discoveredSection =
(payload['sections'] as Map<String, dynamic>)['discoveredContacts']
as Map<String, dynamic>;
final preferences =
discoveredSection['preferences'] as Map<String, dynamic>;
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');
},
);
}
+19
View File
@@ -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",