2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Missing null check and bootstrap ask

Browse source
This commit is contained in:
Christian Pauly 2021-08-01 15:45:41 +02:00
commit 21801318eb
4 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/pages/bootstrap_dialog.dart
View file

@ -1,4 +1,6 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/flutter_matrix_hive_database.dart';
import 'package:matrix/encryption.dart';
import 'package:matrix/encryption/utils/bootstrap.dart';
import 'package:matrix/matrix.dart';
@ -65,6 +67,12 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
});
}
void cancelAndDontAskAgain() async {
await (widget.client.database as FlutterMatrixHiveStore)
.put(SettingKeys.dontAskForBootstrapKey, true);
Navigator.of(context, rootNavigator: false).pop<bool>(false);
}
@override
Widget build(BuildContext context) {
_wipe ??= widget.wipe;
@ -81,6 +89,11 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
label: L10n.of(context).next,
onPressed: () => _createBootstrap(false),
));
buttons.add(AdaptiveFlatButton(
label: L10n.of(context).dontAskAgain,
onPressed: cancelAndDontAskAgain,
textColor: Colors.red,
));
} else if (bootstrap.newSsssKey?.recoveryKey != null &&
_recoveryKeyStored == false) {
final key = bootstrap.newSsssKey.recoveryKey;