fluffychat merge

lib/pages/chat_access_settings/chat_access_settings_controller.dart

@@ -55,6 +55,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);
     }
 

pubspec.lock

@@ -836,10 +836,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:
@@ -1801,10 +1801,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:
@@ -2670,10 +2670,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331"
+      sha256: "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.17"
+    version: "1.1.20"
   vector_math:
     dependency: transitive
     description:
@@ -2886,10 +2886,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:
@@ -2899,5 +2899,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
+  dart: ">=3.9.0 <4.0.0"
   flutter: ">=3.32.0"

pubspec.yaml

@@ -63,10 +63,10 @@ dependencies:
   # #Pangea
   # matrix: ^3.0.1
   matrix:
-    path: /Users/ggurdin/pangea/matrix-dart-sdk
     # git:
-    #   url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
-    #   ref: merge-upstream
+    #   url: https://github.com/famedly/matrix-dart-sdk.git
+    #   ref: krille/refactor-update-user-device-keys
+    path: /Users/ggurdin/pangea/matrix-dart-sdk
   # Pangea#
   mime: ^2.0.0
   native_imaging: ^0.2.0
@@ -133,7 +133,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