GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Dont enable encryption with bots

This commit is contained in:
Krille Fear 2021-11-13 11:51:35 +01:00
parent 9c9a2c0bb5
commit a817773de8
4 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pages/new_group/new_group.dart
View File

@ -25,23 +25,12 @@ class NewGroupController extends State<NewGroup> {
final roomID = await showFutureLoadingDialog(
context: context,
future: () async {
final roomId = await client.createRoom(
final roomId = await client.createGroupChat(
preset: publicGroup
? sdk.CreateRoomPreset.publicChat
: sdk.CreateRoomPreset.privateChat,
visibility: publicGroup ? sdk.Visibility.public : null,
roomAliasName: publicGroup && controller.text.isNotEmpty
? controller.text.trim().toLowerCase().replaceAll(' ', '_')
: null,
name: controller.text.isNotEmpty ? controller.text : null,
groupName: controller.text.isNotEmpty ? controller.text : null,
);
if (client.getRoomById(roomId) == null) {
await client.onSync.stream.firstWhere(
(sync) => sync.rooms?.join?.containsKey(roomId) ?? false);
}
if (!publicGroup && client.encryptionEnabled) {
await client.getRoomById(roomId).enableEncryption();
}
return roomId;
},
);

11
lib/pages/search/search_view.dart
View File

@ -253,17 +253,6 @@ class SearchView extends StatelessWidget {
final client = Matrix.of(context).client;
final roomId = await client
.startDirectChat(foundProfile.userId);
if (client.getRoomById(roomId) == null) {
await client.onSync.stream.firstWhere((sync) =>
sync.rooms?.join?.containsKey(roomId) ??
false);
}
final room = client.getRoomById(roomId);
if (client.encryptionEnabled && !room.encrypted) {
await client
.getRoomById(roomId)
.enableEncryption();
}
return roomId;
},
);

9
lib/pages/user_bottom_sheet/user_bottom_sheet.dart
View File

@ -88,15 +88,6 @@ class UserBottomSheetController extends State<UserBottomSheet> {
context: context,
future: () async {
final roomId = await widget.user.startDirectChat();
final client = widget.user.room.client;
if (client.getRoomById(roomId) == null) {
await client.onSync.stream.firstWhere(
(sync) => sync.rooms?.join?.containsKey(roomId) ?? false);
}
final room = client.getRoomById(roomId);
if (client.encryptionEnabled && !room.encrypted) {
await client.getRoomById(roomId).enableEncryption();
}
return roomId;
},
);

8
lib/widgets/profile_bottom_sheet.dart
View File

@ -27,14 +27,6 @@ class ProfileBottomSheet extends StatelessWidget {
context: context,
future: () async {
final roomId = await client.startDirectChat(userId);
if (client.getRoomById(roomId) == null) {
await client.onSync.stream.firstWhere(
(sync) => sync.rooms?.join?.containsKey(roomId) ?? false);
}
final room = client.getRoomById(roomId);
if (client.encryptionEnabled && !room.encrypted) {
await client.getRoomById(roomId).enableEncryption();
}
return roomId;
},
);