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/chat_list.dart
View file

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