From 6a02db73bbc44d6a4097ab1fd81f797c9000143c Mon Sep 17 00:00:00 2001
From: WilsonLe <leanhminh2907@gmail.com>
Date: Wed, 17 Jul 2024 12:14:07 -0400
Subject: [PATCH 1/3] integrate forked matrix sdk, addressing breaking changes
 of newer versions of matrix sdk

---
 lib/pages/chat/events/video_player.dart      | 19 +++++++++----------
 lib/utils/localized_exception_extension.dart |  5 +----
 pubspec.lock                                 |  9 ++++-----
 pubspec.yaml                                 |  5 ++++-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart
index 1b0983bd4..d76d49576 100644
--- a/lib/pages/chat/events/video_player.dart
+++ b/lib/pages/chat/events/video_player.dart
@@ -1,21 +1,20 @@
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
 import 'package:chewie/chewie.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:matrix/matrix.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:universal_html/html.dart' as html;
-import 'package:video_player/video_player.dart';
-
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/events/image_bubble.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/blur_hash.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:universal_html/html.dart' as html;
+import 'package:video_player/video_player.dart';
+
 import '../../../utils/error_reporter.dart';
 
 class EventVideoPlayer extends StatefulWidget {
@@ -71,7 +70,7 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
           autoInitialize: true,
         );
       }
-    } on MatrixConnectionException catch (e) {
+    } on Exception catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           content: Text(e.toLocalizedString(context)),
diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart
index 65be02a1f..5b2df02fd 100644
--- a/lib/utils/localized_exception_extension.dart
+++ b/lib/utils/localized_exception_extension.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/encryption.dart';
 import 'package:matrix/matrix.dart';
@@ -67,9 +66,7 @@ extension LocalizedExceptionExtension on Object {
         supportedVersions,
       );
     }
-    if (this is MatrixConnectionException ||
-        this is SocketException ||
-        this is SyncConnectionException) {
+    if (this is SocketException || this is SyncConnectionException) {
       return L10n.of(context)!.noConnectionToTheServer;
     }
     if (this is String) return toString();
diff --git a/pubspec.lock b/pubspec.lock
index 7a4059d66..bc213b7c6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1432,11 +1432,10 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      sha256: bb6de59d0f69e10bb6893130a967f1ffcbfa3d3ffed3864f0736ce3d968e669c
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.29.12"
+      path: "../matrix-dart-sdk"
+      relative: true
+    source: path
+    version: "0.30.0"
   meta:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a24dfdff3..1e75fc4b5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -70,7 +70,10 @@ dependencies:
   keyboard_shortcuts: ^0.1.4
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  matrix: ^0.29.12
+  matrix:
+    git:
+      url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
+      ref: main # branch
   native_imaging: ^0.1.1
   package_info_plus: ^6.0.0
   pasteboard: ^0.2.0

From 65c4f4472dfa71c7fd7e35379972390be14ef8d7 Mon Sep 17 00:00:00 2001
From: WilsonLe <leanhminh2907@gmail.com>
Date: Fri, 19 Jul 2024 14:30:19 -0400
Subject: [PATCH 2/3] add extra class method to prevent breaking changes

---
 lib/utils/matrix_sdk_extensions/matrix_locals.dart | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/utils/matrix_sdk_extensions/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart
index 5714baa22..b4536b6db 100644
--- a/lib/utils/matrix_sdk_extensions/matrix_locals.dart
+++ b/lib/utils/matrix_sdk_extensions/matrix_locals.dart
@@ -344,4 +344,10 @@ class MatrixLocals extends MatrixLocalizations {
   @override
   String startedKeyVerification(String senderName) =>
       l10n.startedKeyVerification(senderName);
+
+  @override
+  String invitedBy(String senderName) {
+    // TODO: implement invitedBy
+    throw UnimplementedError();
+  }
 }

From d8b3187dc50845c89db33765b0441b9124ead425 Mon Sep 17 00:00:00 2001
From: WilsonLe <leanhminh2907@gmail.com>
Date: Fri, 19 Jul 2024 14:31:19 -0400
Subject: [PATCH 3/3] update pubspec.lock to point to latest sdk

---
 pubspec.lock | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index bc213b7c6..ae95fb892 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1432,9 +1432,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      path: "../matrix-dart-sdk"
-      relative: true
-    source: path
+      path: "."
+      ref: main
+      resolved-ref: "0a95cd8f3cfac8c9b0b59d6ee7fdbdb159949ca3"
+      url: "https://github.com/pangeachat/matrix-dart-sdk.git"
+    source: git
     version: "0.30.0"
   meta:
     dependency: transitive