diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 27d33b62..1f6c693c 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -973,12 +973,18 @@ class MeshCoreConnector extends ChangeNotifier { final lastCompanionPublicKeyHex = prefs.getString( _lastCompanionPublicKeyPref, ); - if (lastCompanionPublicKeyHex == null || - lastCompanionPublicKeyHex.trim().isEmpty) { - return; + try { + if (lastCompanionPublicKeyHex == null || + lastCompanionPublicKeyHex.trim().isEmpty) { + return; + } + _selfPublicKey = hexToPubKey(lastCompanionPublicKeyHex); + _setScopedStorePublicKey(lastCompanionPublicKeyHex); + } catch (e) { + _appDebugLogService?.error( + 'Failed to restore last companion scope with public key hex: $lastCompanionPublicKeyHex, error: $e', + ); } - _selfPublicKey = hexToPubKey(lastCompanionPublicKeyHex); - _setScopedStorePublicKey(lastCompanionPublicKeyHex); } Future loadDiscoveredContactCache() => _loadDiscoveredContactCache(); diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index cca8c046..25b39dbc 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -1968,7 +1968,7 @@ class AppLocalizationsNl extends AppLocalizations { @override String get dialog_disconnectedMessage => - 'Je bent verbonden met je companion.'; + 'Je bent losgekoppeld van je companion.'; @override String get dialog_connectCompanion => diff --git a/lib/screens/contacts_screen.dart b/lib/screens/contacts_screen.dart index 0c09326c..8a4011c7 100644 --- a/lib/screens/contacts_screen.dart +++ b/lib/screens/contacts_screen.dart @@ -324,12 +324,12 @@ class _ContactsScreenState extends State { Text(context.l10n.contacts_zeroHopAdvert), ], ), - onTap: () => { - connector.sendSelfAdvert(flood: false), + onTap: () async { + await connector.sendSelfAdvert(flood: false); showDismissibleSnackBar( context, content: Text(context.l10n.settings_advertisementSent), - ), + ); }, ), PopupMenuItem( @@ -340,12 +340,12 @@ class _ContactsScreenState extends State { Text(context.l10n.contacts_floodAdvert), ], ), - onTap: () => { - connector.sendSelfAdvert(flood: true), + onTap: () async { + await connector.sendSelfAdvert(flood: true); showDismissibleSnackBar( context, content: Text(context.l10n.settings_advertisementSent), - ), + ); }, ), PopupMenuItem(