From 286d1662a47ff8fdfb3c5860eb57ec6a3e39d6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Mon, 20 Oct 2025 14:40:58 +0200
Subject: [PATCH 1/3] chore: Hide restricted and knock restricted for
 unsupported room versions

---
 .../chat_access_settings_controller.dart                 | 9 +++++++++
 1 file changed, 9 insertions(+)

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 b39b3daf1..581da363c 100644
--- a/lib/pages/chat_access_settings/chat_access_settings_controller.dart
+++ b/lib/pages/chat_access_settings/chat_access_settings_controller.dart
@@ -54,6 +54,15 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
     // Knock is only supported for rooms up from version 7:
     if (roomVersionInt != null && roomVersionInt <= 6) {
       joinRules.remove(JoinRules.knock);
+    }
+
+    // Restricted is only supported for rooms up from version 8:
+    if (roomVersionInt != null && roomVersionInt <= 7) {
+      joinRules.remove(JoinRules.restricted);
+    }
+
+    // Knock-Restricted is only supported for rooms up from version 10:
+    if (roomVersionInt != null && roomVersionInt <= 9) {
       joinRules.remove(JoinRules.knockRestricted);
     }
 

From 0495b58065eba4dda0d26bcbbaec55caae896bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Mon, 20 Oct 2025 16:14:02 +0200
Subject: [PATCH 2/3] chore: Try out refactored user device keys update method

---
 pubspec.lock | 9 +++++----
 pubspec.yaml | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 8ce8b3a64..c2fca858c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1113,10 +1113,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      sha256: "84354dd61f47b297631a3fe5eeebb5c1e0725f872b8fae75851a49cd5689c4f1"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "krille/refactor-update-user-device-keys"
+      resolved-ref: "141ca1cbf98acac56c41502a700e25eb9802edd3"
+      url: "https://github.com/famedly/matrix-dart-sdk.git"
+    source: git
     version: "3.0.1"
   meta:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index cb3339447..6b7d3c966 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -52,7 +52,10 @@ dependencies:
   just_audio: ^0.10.5
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  matrix: ^3.0.1
+  matrix:
+    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

From 0d7e1aa40f4bff565a9cf24fe086c596aa6bbef2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:16:29 +0000
Subject: [PATCH 3/3] build: (deps): bump flutter_native_splash from 2.4.6 to
 2.4.7

Bumps [flutter_native_splash](https://github.com/jonbhanson/flutter_native_splash) from 2.4.6 to 2.4.7.
- [Release notes](https://github.com/jonbhanson/flutter_native_splash/releases)
- [Changelog](https://github.com/jonbhanson/flutter_native_splash/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jonbhanson/flutter_native_splash/compare/v2.4.6...v2.4.7)

---
updated-dependencies:
- dependency-name: flutter_native_splash
  dependency-version: 2.4.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pubspec.lock | 12 ++++++------
 pubspec.yaml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index c2fca858c..f460e39e9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -564,10 +564,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.7"
   flutter_new_badger:
     dependency: "direct main"
     description:
@@ -1323,10 +1323,10 @@ packages:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "7.0.1"
   platform:
     dependency: transitive
     description:
@@ -2288,10 +2288,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.6.1"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6b7d3c966..153e8990b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -89,7 +89,7 @@ dependencies:
 
 dev_dependencies:
   flutter_lints: ^3.0.0
-  flutter_native_splash: ^2.4.6
+  flutter_native_splash: ^2.4.7
   flutter_test:
     sdk: flutter
   import_sorter: ^4.6.0