fluffychat merge - resolve conflicts

lib/pages/chat/events/video_player.dart

@@ -70,7 +70,7 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
           autoInitialize: true,
         );
       }
-    } on Exception catch (e) {
+    } on IOException catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           content: Text(e.toLocalizedString(context)),

lib/utils/localized_exception_extension.dart

@@ -66,7 +66,9 @@ extension LocalizedExceptionExtension on Object {
         supportedVersions,
       );
     }
-    if (this is SocketException || this is SyncConnectionException) {
+    if (this is IOException ||
+        this is SocketException ||
+        this is SyncConnectionException) {
       return L10n.of(context)!.noConnectionToTheServer;
     }
     if (this is String) return toString();

pubspec.yaml

@@ -75,7 +75,7 @@ dependencies:
     git:
       url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
       ref: main # branch
-  # matrix: ^0.29.13
+  # matrix: ^0.30.0
   # Pangea#
   native_imaging: ^0.1.1
   package_info_plus: ^6.0.0