fluffychat merge

CHANGELOG.md

@@ -1,3 +1,19 @@
+## v1.26.1
+
+Updates the Matrix Dart SDK to fix multiple issues where messages can be missing in the timeline.
+
+- feat: Reenable archive feature after various fixes landed in sdk (krille-chan)
+- build: Update matrix dart sdk to 0.40.0 (Christian Kußowski)
+- chore: Adjust new chat page design (krille-chan)
+- chore: Display count of invited in members page (krille-chan)
+- chore: Do not load timeline while sync processing (Krille)
+- chore: Do not store event from push in database (Krille)
+- chore: Only show joined members in members list by default (Krille)
+- chore: Remove matrix notification workflow (Krille)
+- fix(docs): escape tag (Sophie L)
+- fix: Crash when opening settings in column mode from popup menu (krille-chan)
+- refactor: Display thread messages like replies as a thread fallback (Krille)
+
 ## v1.26.0
 
 - feat: Add advanced configuration page (Krille)

lib/pages/chat/chat.dart

@@ -1088,10 +1088,19 @@ class ChatController extends State<ChatPageWithRoom>
     );
     if (result == null) return;
     final audioFile = XFile(result.path);
+
+    final bytesResult = await showFutureLoadingDialog(
+      context: context,
+      future: audioFile.readAsBytes,
+    );
+    final bytes = bytesResult.result;
+    if (bytes == null) return;
+
     final file = MatrixAudioFile(
-      bytes: await audioFile.readAsBytes(),
+      bytes: bytes,
       name: result.fileName ?? audioFile.path,
     );
+
     await room.sendFileEvent(
       file,
       inReplyTo: replyEvent,

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -31,7 +31,7 @@ import package_info_plus
 import pasteboard
 import path_provider_foundation
 import purchases_flutter
-import record_darwin
+import record_macos
 import rive_common
 import sentry_flutter
 import share_plus
@@ -72,7 +72,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   PurchasesFlutterPlugin.register(with: registry.registrar(forPlugin: "PurchasesFlutterPlugin"))
-  RecordPlugin.register(with: registry.registrar(forPlugin: "RecordPlugin"))
+  RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
   RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
   SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

pubspec.lock

@@ -2007,10 +2007,10 @@ packages:
     dependency: "direct main"
     description:
       name: record
-      sha256: "2e3d56d196abcd69f1046339b75e5f3855b2406fc087e5991f6703f188aa03a6"
+      sha256: daeb3f9b3fea9797094433fe6e49a879d8e4ca4207740bc6dc7e4a58764f0817
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "6.0.0"
   record_android:
     dependency: transitive
     description:
@@ -2019,22 +2019,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.3"
-  record_darwin:
+  record_ios:
     dependency: transitive
     description:
-      name: record_darwin
-      sha256: e487eccb19d82a9a39cd0126945cfc47b9986e0df211734e2788c95e3f63c82c
+      name: record_ios
+      sha256: "73706ebbece6150654c9d6f57897cf9b622c581148304132ba85dba15df0fdfb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.0.0"
   record_linux:
     dependency: transitive
     description:
       name: record_linux
-      sha256: "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3"
+      sha256: fcb5964a84292813de70d52253663c1caca00a15f849fb5d0fdf9b929b28a7b9
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "1.0.0"
+  record_macos:
+    dependency: transitive
+    description:
+      name: record_macos
+      sha256: "02240833fde16c33fcf2c589f3e08d4394b704761b4a3bb609d872ff3043fbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   record_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -89,7 +89,7 @@ dependencies:
   qr_code_scanner_plus: ^2.0.10+1
   qr_image: ^1.0.0
   receive_sharing_intent: ^1.8.1
-  record: ^5.1.2
+  record: ^6.0.0
   scroll_to_index: ^3.0.1
   share_plus: ^10.0.2
   shared_preferences: ^2.2.0 # Pinned because https://github.com/flutter/flutter/issues/118401

scripts/release-ios-testflight.sh

@@ -6,6 +6,8 @@ flutter pub get
 cd ios
 rm -rf Pods
 rm -f Podfile.lock
+pod install
+pod update
 cd ..
 flutter build ios --release
 cd ios