GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-20 02:59:26 +01:00
Code Issues Projects Releases Wiki Activity

fix: Missing null check and bootstrap ask

Browse Source
This commit is contained in:
Christian Pauly 2021-08-01 15:45:41 +02:00
parent bb7c095ae3
commit 0135780f65
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/l10n/intl_en.arb
View File

@ -903,6 +903,11 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"dontAskAgain": "Cancel and don't ask again",
"@dontAskAgain": {
"type": "text",
"placeholders": {}
},
"encrypted": "Encrypted", "encrypted": "Encrypted",
"@encrypted": { "@encrypted": {
"type": "text", "type": "text",

2
lib/config/setting_keys.dart
View File

@ -18,4 +18,6 @@ abstract class SettingKeys {
static const String unifiedPushEndpoint = 'chat.fluffy.unifiedpush.endpoint'; static const String unifiedPushEndpoint = 'chat.fluffy.unifiedpush.endpoint';
static const String notificationCurrentIds = 'chat.fluffy.notification_ids'; static const String notificationCurrentIds = 'chat.fluffy.notification_ids';
static const String ownStatusMessage = 'chat.fluffy.status_msg'; static const String ownStatusMessage = 'chat.fluffy.status_msg';
static const String dontAskForBootstrapKey =
'chat.fluffychat.dont_ask_bootstrap';
} }

13
lib/pages/bootstrap_dialog.dart
View File

@ -1,4 +1,6 @@
import 'package:adaptive_dialog/adaptive_dialog.dart'; 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.dart';
import 'package:matrix/encryption/utils/bootstrap.dart'; import 'package:matrix/encryption/utils/bootstrap.dart';
import 'package:matrix/matrix.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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_wipe ??= widget.wipe; _wipe ??= widget.wipe;
@ -81,6 +89,11 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
label: L10n.of(context).next, label: L10n.of(context).next,
onPressed: () => _createBootstrap(false), onPressed: () => _createBootstrap(false),
)); ));
buttons.add(AdaptiveFlatButton(
label: L10n.of(context).dontAskAgain,
onPressed: cancelAndDontAskAgain,
textColor: Colors.red,
));
} else if (bootstrap.newSsssKey?.recoveryKey != null && } else if (bootstrap.newSsssKey?.recoveryKey != null &&
_recoveryKeyStored == false) { _recoveryKeyStored == false) {
final key = bootstrap.newSsssKey.recoveryKey; final key = bootstrap.newSsssKey.recoveryKey;

13
lib/pages/chat_list.dart
View File

@ -2,6 +2,8 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:adaptive_dialog/adaptive_dialog.dart'; 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/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/fluffy_share.dart';
@ -156,6 +158,11 @@ class ChatListController extends State<ChatList> {
_initReceiveSharingIntent(); _initReceiveSharingIntent();
WidgetsBinding.instance.addPostFrameCallback((_) async { WidgetsBinding.instance.addPostFrameCallback((_) async {
if (!Matrix.of(context).client.encryptionEnabled) return; if (!Matrix.of(context).client.encryptionEnabled) return;
if ((Matrix.of(context).client.database as FlutterMatrixHiveStore)
.get(SettingKeys.dontAskForBootstrapKey) ==
true) {
return;
}
final crossSigning = await crossSigningCachedFuture; final crossSigning = await crossSigningCachedFuture;
final needsBootstrap = final needsBootstrap =
Matrix.of(context).client.encryption?.crossSigning?.enabled == Matrix.of(context).client.encryption?.crossSigning?.enabled ==
@ -181,10 +188,12 @@ class ChatListController extends State<ChatList> {
if (room.isSpace) return false; if (room.isSpace) return false;
if (activeSpaceId != null) { if (activeSpaceId != null) {
final space = Matrix.of(context).client.getRoomById(activeSpaceId); final space = Matrix.of(context).client.getRoomById(activeSpaceId);
if (space.spaceChildren.any((child) => child.roomId == room.id)) { if (space.spaceChildren?.any((child) => child.roomId == room.id) ??
false) {
return true; return true;
} }
if (room.spaceParents.any((parent) => parent.roomId == activeSpaceId)) { if (room.spaceParents?.any((parent) => parent.roomId == activeSpaceId) ??
false) {
return true; return true;
} }
if (room.isDirectChat && if (room.isDirectChat &&