diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index 2c05ce427..e4d88a3c1 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -77,28 +77,21 @@ class _BootstrapDialogState extends State { return L10n.of(context)!.storeSecurlyOnThisDevice; } - static const secureStorage = FlutterSecureStorage( - aOptions: AndroidOptions( - encryptedSharedPreferences: true, - ), - ); - @override void initState() { _createBootstrap(widget.wipe); super.initState(); } - void _createBootstrap(bool wipe) { + void _createBootstrap(bool wipe) async { _wipe = wipe; titleText = null; _recoveryKeyStored = false; bootstrap = widget.client.encryption!.bootstrap(onUpdate: () => setState(() {})); - secureStorage.read(key: _secureStorageKey).then((key) { - if (key == null) return; - _recoveryKeyTextEditingController.text = key; - }); + final key = await const FlutterSecureStorage().read(key: _secureStorageKey); + if (key == null) return; + _recoveryKeyTextEditingController.text = key; } @override @@ -188,7 +181,7 @@ class _BootstrapDialogState extends State { (_recoveryKeyCopied || _storeInSecureStorage == true) ? () { if (_storeInSecureStorage == true) { - secureStorage.write( + const FlutterSecureStorage().write( key: _secureStorageKey, value: key, ); diff --git a/pubspec.lock b/pubspec.lock index 771a6d892..b37837c03 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -654,21 +654,21 @@ packages: name: flutter_secure_storage url: "https://pub.dartlang.org" source: hosted - version: "5.0.2" + version: "5.1.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" flutter_secure_storage_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index cb0eda387..981365be3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,7 +43,7 @@ dependencies: flutter_olm: ^1.2.0 flutter_openssl_crypto: ^0.1.0 flutter_ringtone_player: ^3.1.1 - flutter_secure_storage: ^5.0.2 + flutter_secure_storage: ^5.1.0 flutter_slidable: ^1.2.0 flutter_svg: ^0.22.0 flutter_typeahead: ^4.0.0