fluffychat merge

lib/pages/chat_access_settings/chat_access_settings_controller.dart

@@ -1,8 +1,3 @@
-import 'package:flutter/material.dart' hide Visibility;
-
-import 'package:go_router/go_router.dart';
-import 'package:matrix/matrix.dart';
-
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/chat_settings/pages/pangea_chat_access_settings.dart';
 import 'package:fluffychat/pangea/extensions/join_rule_extension.dart';
@@ -12,6 +7,9 @@ import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.
 import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:flutter/material.dart' hide Visibility;
+import 'package:go_router/go_router.dart';
+import 'package:matrix/matrix.dart';
 
 class ChatAccessSettings extends StatefulWidget {
   final String roomId;
@@ -92,9 +90,9 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
       // #Pangea
       // await room.setJoinRules(
       //   newJoinRules,
-      //   allowConditionRoomId: {JoinRules.restricted, JoinRules.knockRestricted}
+      //   allowConditionRoomIds: {JoinRules.restricted, JoinRules.knockRestricted}
       //           .contains(newJoinRules)
-      //       ? knownSpaceParents.first.id
+      //       ? knownSpaceParents.map((parent) => parent.id).toList()
       //       : null,
       // );
       await room.pangeaSetJoinRules(

pubspec.lock

@@ -946,10 +946,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_vodozemac
-      sha256: "54cd3790b6dfdc1afce928f8c46f7eeea9e4f8326f077400894935926f202057"
+      sha256: "16d4b44dd338689441fe42a80d0184e5c864e9563823de9e7e6371620d2c0590"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.1"
   flutter_web_auth_2:
     dependency: "direct main"
     description:
@@ -2742,10 +2742,10 @@ packages:
     dependency: transitive
     description:
       name: vodozemac
-      sha256: "95cac62ffab94db99e134c8f9aac198f8131a4eed0bed76a6cfc9c72add229b9"
+      sha256: "39144e20740807731871c9248d811ed5a037b21d0aa9ffcfa630954de74139d9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.0"
   wakelock_plus:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -46,7 +46,7 @@ dependencies:
   flutter_new_badger: ^1.1.1
   flutter_secure_storage: ^9.2.4
   flutter_shortcuts_new: ^2.0.0
-  flutter_vodozemac: ^0.3.0
+  flutter_vodozemac: ^0.4.1
   flutter_web_auth_2: ^3.1.1 # Version 4 blocked by https://github.com/MixinNetwork/flutter-plugins/issues/379
   flutter_webrtc: ^1.2.0
   geolocator: ^14.0.2
@@ -61,7 +61,10 @@ dependencies:
   latlong2: ^0.9.1
   linkify: ^5.0.0
   # #Pangea
-  # matrix: ^3.0.1
+  # matrix: #^3.0.1
+  #   git:
+  #     url: https://github.com/famedly/matrix-dart-sdk.git
+  #     ref: krille/refactor-update-user-device-keys
   matrix:
     path: /Users/ggurdin/pangea/matrix-dart-sdk
   # Pangea#