diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 0c1e668f..96ff1e0e 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -2133,6 +2133,8 @@ class MeshCoreConnector extends ChangeNotifier { notifyListeners(); } + Future reloadChannelOrder() => _loadChannelOrder(); + /// History is stored by channel ID, so it may carry the slot the channel /// sat in when it was saved; rebind it to the slot it is shown in now. List _bindToSlot(List messages, int slot) => [ diff --git a/lib/screens/backup_restore_screen.dart b/lib/screens/backup_restore_screen.dart index 84b47d2a..3387708e 100644 --- a/lib/screens/backup_restore_screen.dart +++ b/lib/screens/backup_restore_screen.dart @@ -16,6 +16,7 @@ import '../services/app_settings_service.dart'; import '../services/backup_service.dart'; import '../services/image_codec_service.dart'; import '../services/translation_service.dart'; +import '../services/ui_view_state_service.dart'; import '../services/message_filter/message_filter_service.dart'; import '../utils/platform_info.dart'; import '../utils/share_origin.dart'; @@ -432,6 +433,7 @@ class _BackupRestoreScreenState extends State { final l10n = context.l10n; final connector = context.read(); final appSettingsService = context.read(); + final uiViewStateService = context.read(); final messageFilterService = context.read(); final translationService = context.read(); final imageCodecService = context.read(); @@ -454,6 +456,7 @@ class _BackupRestoreScreenState extends State { )) { await appSettingsService.loadSettings(); if (_selectedItems.contains(BackupItem.appSettings)) { + await uiViewStateService.reload(); await _offerMissingModels( appSettingsService, translationService, diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart index ea0d5e36..02917f2b 100644 --- a/lib/services/backup_service.dart +++ b/lib/services/backup_service.dart @@ -485,6 +485,12 @@ class BackupService { ); } } + if (selectedItems.contains(BackupItem.appSettings)) { + await appSettingsService.loadSettings(); + } + if (selectedItems.contains(BackupItem.channelSettings)) { + await connector.reloadChannelOrder(); + } if (!importingIdentity && selectedItems.contains(BackupItem.discoveredContacts)) { await connector.reloadDiscoveredContacts(); diff --git a/lib/services/ui_view_state_service.dart b/lib/services/ui_view_state_service.dart index 34e31921..a6754d21 100644 --- a/lib/services/ui_view_state_service.dart +++ b/lib/services/ui_view_state_service.dart @@ -109,6 +109,11 @@ class UiViewStateService extends ChangeNotifier { } } + Future reload() async { + await initialize(); + notifyListeners(); + } + void setContactsSelectedGroupName(String value) { if (_contactsSelectedGroupName == value) return; _contactsSelectedGroupName = value; diff --git a/test/connector/channel_slot_map_test.dart b/test/connector/channel_slot_map_test.dart index b3a60575..cdcbafa7 100644 --- a/test/connector/channel_slot_map_test.dart +++ b/test/connector/channel_slot_map_test.dart @@ -259,6 +259,19 @@ void main() { }, ); + test('reloads a restored custom channel order', () async { + await _connect(_TestRadio()); + final restoredOrder = [_id(_psk(1)), _id(_psk(0)), _id(_psk(2))]; + await PrefsManager.instance.setString( + 'channel_order_$_scope', + jsonEncode(restoredOrder), + ); + + await _connector.reloadChannelOrder(); + + expect(_connector.channels.first.storageId, restoredOrder.first); + }); + test('deleting a channel clears its stored history', () async { await _connect(_TestRadio()); await _waitFor(() => _texts(1).contains(_queuedHikingText)); diff --git a/test/connector/message_filter_ingest_test.dart b/test/connector/message_filter_ingest_test.dart index da9c03bf..c30436f4 100644 --- a/test/connector/message_filter_ingest_test.dart +++ b/test/connector/message_filter_ingest_test.dart @@ -410,6 +410,11 @@ void main() { test('mesh copies of one message are stored and filtered once', () async { await _connect(); + await _waitFor( + () => ReviewScript.seedChannelMessages.every( + (message) => _find(message.channelIndex, message.text) != null, + ), + ); const text = 'Weather net starts at seven tonight on the hill'; final ts = _nowSecs(); final cleanBefore = _filter.recentCleanCount; diff --git a/test/services/backup_service_test.dart b/test/services/backup_service_test.dart index ad6e46ce..bb8ede62 100644 --- a/test/services/backup_service_test.dart +++ b/test/services/backup_service_test.dart @@ -12,6 +12,7 @@ import 'package:meshcore_open/services/image_codec_settings_store.dart'; import 'package:meshcore_open/services/translation_file_store.dart'; import 'package:meshcore_open/services/translation_service.dart'; import 'package:meshcore_open/services/backup_service.dart'; +import 'package:meshcore_open/services/ui_view_state_service.dart'; import 'package:meshcore_open/storage/prefs_manager.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -211,6 +212,65 @@ void main() { expect(restored['map_tile_api_key'], 'existing-stadia'); }, ); + + test('applies restored app settings to the live service', () async { + SharedPreferences.setMockInitialValues({ + 'app_settings': jsonEncode({'evict_discovered_contacts_enabled': true}), + }); + PrefsManager.reset(); + await PrefsManager.initialize(); + addTearDown(PrefsManager.reset); + final connector = MeshCoreConnector(); + final settingsService = AppSettingsService(); + addTearDown(connector.dispose); + addTearDown(settingsService.dispose); + await settingsService.loadSettings(); + + final backup = await BackupService.encodeBackup({ + 'format': 'meshcore-open-backup', + 'version': 1, + 'sourcePublicKey': '', + 'items': [BackupItem.appSettings.name], + 'sections': { + 'appSettings': { + 'preferences': { + 'app_settings': {'evict_discovered_contacts_enabled': false}, + }, + }, + }, + }, password: ''); + await const BackupService().restoreBackup( + contents: backup, + password: '', + items: {BackupItem.appSettings}, + connector: connector, + appSettingsService: settingsService, + ); + + expect(settingsService.settings.evictDiscoveredContactsEnabled, isFalse); + }); + }); + + group('UiViewStateService reload', () { + test('notifies listeners with restored sort preferences', () async { + SharedPreferences.setMockInitialValues({}); + PrefsManager.reset(); + await PrefsManager.initialize(); + addTearDown(PrefsManager.reset); + final viewState = UiViewStateService(); + addTearDown(viewState.dispose); + await viewState.initialize(); + var notifications = 0; + viewState.addListener(() => notifications++); + + await PrefsManager.instance.setString('ui_contacts_sort_option', 'name'); + await PrefsManager.instance.setString('ui_channels_sort_option', 'name'); + await viewState.reload(); + + expect(viewState.contactsSortOption.name, 'name'); + expect(viewState.channelsSortOption, ChannelSortOption.name); + expect(notifications, 1); + }); }); group('restored model registry reconciliation', () {