From 60f688afa9bb1d331d1a6931630924fec4ceacc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Fri, 31 Oct 2025 08:30:36 +0100
Subject: [PATCH] chore: Try out experimental new matrix sdk version with
 performance leak fix

---
 .../chat_access_settings_controller.dart      |  4 ++--
 pubspec.lock                                  | 19 ++++++++++---------
 pubspec.yaml                                  |  7 +++++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/pages/chat_access_settings/chat_access_settings_controller.dart b/lib/pages/chat_access_settings/chat_access_settings_controller.dart
index 581da363c..84d8405ab 100644
--- a/lib/pages/chat_access_settings/chat_access_settings_controller.dart
+++ b/lib/pages/chat_access_settings/chat_access_settings_controller.dart
@@ -87,9 +87,9 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
     try {
       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,
       );
     } catch (e, s) {
diff --git a/pubspec.lock b/pubspec.lock
index ac856507e..df57bc765 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -658,10 +658,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:
@@ -1113,11 +1113,12 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      sha256: "84354dd61f47b297631a3fe5eeebb5c1e0725f872b8fae75851a49cd5689c4f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
+      path: "."
+      ref: "krille/refactor-update-user-device-keys"
+      resolved-ref: d35d78f3b7c38671888e87b9aa80d2a93c811b82
+      url: "https://github.com/famedly/matrix-dart-sdk.git"
+    source: git
+    version: "3.0.2"
   meta:
     dependency: transitive
     description:
@@ -2143,10 +2144,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:
diff --git a/pubspec.yaml b/pubspec.yaml
index 77e5a3a0e..ab99205f3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,7 +38,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
@@ -52,7 +52,10 @@ dependencies:
   just_audio: ^0.10.5
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  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
   mime: ^2.0.0
   native_imaging: ^0.2.0
   opus_caf_converter_dart: ^1.0.1