fluffychat merge

assets/l10n/intl_es.arb

@@ -6083,4 +6083,4 @@
     "type": "String",
     "placeholders": {}
   }
-}
+}

assets/l10n/intl_vi.arb

@@ -4382,4 +4382,4 @@
     "type": "String",
     "placeholders": {}
   }
-}
+}

lib/config/app_config.dart

@@ -9,6 +9,7 @@ abstract class AppConfig {
   // static String _applicationName = 'FluffyChat';
   static String _applicationName = 'Pangea Chat';
   // #Pangea
+
   static String get applicationName => _applicationName;
   static String? _applicationWelcomeMessage;
 
@@ -16,7 +17,8 @@ abstract class AppConfig {
   // #Pangea
   // static String _defaultHomeserver = 'matrix.org';
   static String get _defaultHomeserver => Environment.synapseURL;
-  // #Pangea
+  // Pangea#
+
   static String get defaultHomeserver => _defaultHomeserver;
   static double fontSizeFactor = 1;
   static const Color chatColor = primaryColor;
@@ -24,6 +26,7 @@ abstract class AppConfig {
   static const double messageFontSize = 16.0;
   static const bool allowOtherHomeservers = true;
   static const bool enableRegistration = true;
+  // #Pangea
   static const double toolbarMaxHeight = 250.0;
   static const double toolbarMinHeight = 200.0;
   static const double toolbarMinWidth = 350.0;
@@ -82,6 +85,7 @@ abstract class AppConfig {
   //     'https://gitlab.com/famedly/fluffychat/-/blob/main/PRIVACY.md';
   static String _privacyUrl = "https://www.pangeachat.com/privacy";
   //Pangea#
+
   static String get privacyUrl => _privacyUrl;
   // #Pangea
   // static const String website = 'https://fluffychat.im';
@@ -97,19 +101,21 @@ abstract class AppConfig {
   // #Pangea
   // static const String appOpenUrlScheme = 'im.fluffychat';
   static const String appOpenUrlScheme = 'matrix.pangea.chat';
-  static String _webBaseUrl = 'https://fluffychat.im/web';
   // Pangea#
+  static String _webBaseUrl = 'https://fluffychat.im/web';
+
   static String get webBaseUrl => _webBaseUrl;
-  //#Pangea
-  static const String sourceCodeUrl = 'https://gitlab.com/famedly/fluffychat';
+  static const String sourceCodeUrl =
+      'https://github.com/krille-chan/fluffychat';
+  // #Pangea
   // static const String supportUrl =
-  //     'https://gitlab.com/famedly/fluffychat/issues';
+  //     'https://github.com/krille-chan/fluffychat/issues';
+  // static const String changelogUrl =
+  //     'https://github.com/krille-chan/fluffychat/blob/main/CHANGELOG.md';
   static const String supportUrl = 'https://www.pangeachat.com/faqs';
   static const String termsOfServiceUrl =
       'https://www.pangeachat.com/terms-of-service';
-  // static const String changelogUrl =
-  //     'https://github.com/krille-chan/fluffychat/blob/main/CHANGELOG.md';
-  //Pangea#
+  // Pangea#
   static final Uri newIssueUrl = Uri(
     scheme: 'https',
     host: 'github.com',
@@ -145,21 +151,9 @@ abstract class AppConfig {
   static const String schemePrefix = 'matrix:';
   // #Pangea
   // static const String pushNotificationsChannelId = 'fluffychat_push';
-  // static const String pushNotificationsChannelName = 'FluffyChat push channel';
-  // static const String pushNotificationsChannelDescription =
-  //     'Push notifications for FluffyChat';
   // static const String pushNotificationsAppId = 'chat.fluffy.fluffychat';
-  // static const String pushNotificationsGatewayUrl =
-  //     'https://push.fluffychat.im/_matrix/push/v1/notify';
-  // static const String pushNotificationsPusherFormat = 'event_id_only';
   static const String pushNotificationsChannelId = 'pangeachat_push';
-  static const String pushNotificationsChannelName = 'Pangea Chat push channel';
-  static const String pushNotificationsChannelDescription =
-      'Push notifications for Pangea Chat';
   static const String pushNotificationsAppId = 'com.talktolearn.chat';
-  static const String pushNotificationsGatewayUrl =
-      'https://sygnal.pangea.chat/_matrix/push/v1/notify';
-  static const String? pushNotificationsPusherFormat = null;
   // Pangea#
   static const double borderRadius = 18.0;
   static const double columnWidth = 360.0;

lib/config/setting_keys.dart

@@ -50,7 +50,10 @@ enum AppSettings<T> {
   // Pangea#
   pushNotificationsGatewayUrl<String>(
     'pushNotificationsGatewayUrl',
-    'https://push.fluffychat.im/_matrix/push/v1/notify',
+    // #Pangea
+    // 'https://push.fluffychat.im/_matrix/push/v1/notify',
+    'https://sygnal.pangea.chat/_matrix/push/v1/notify',
+    // Pangea#
   ),
   pushNotificationsPusherFormat<String>(
     'pushNotificationsPusherFormat',

lib/pages/chat/events/video_player.dart

@@ -101,7 +101,6 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
         autoPlay: true,
         autoInitialize: true,
       );
-
       // #Pangea
       _stopVideoSubscription?.cancel();
       _stopVideoSubscription =

lib/pages/chat_details/chat_details.dart

@@ -3,6 +3,7 @@ import 'dart:developer';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:collection/collection.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';

lib/pages/chat_details/participant_list_item.dart

@@ -85,14 +85,12 @@ class ParticipantListItem extends StatelessWidget {
                 ),
         ],
       ),
-      subtitle:
-          // #Pangea
-          LevelDisplayName(userId: user.id),
-      // Text(
+      // #Pangea
+      subtitle: LevelDisplayName(userId: user.id),
+      // subtitle: Text(
       //   user.id,
       //   maxLines: 1,
       //   overflow: TextOverflow.ellipsis,
-      // ),
       // Pangea#
       leading: Opacity(
         opacity: user.membership == Membership.join ? 1 : 0.5,

lib/utils/url_launcher.dart

@@ -191,7 +191,6 @@ class UrlLauncher {
         await PublicRoomBottomSheet.show(
           context: context,
           roomAlias: identityParts.primaryIdentifier,
-          // Pangea#
         );
         // Pangea#
       }

pangea_packages/fcm_shared_isolate/example/ios/Flutter/ephemeral/flutter_lldb_helper.py

@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")

pangea_packages/fcm_shared_isolate/example/ios/Flutter/ephemeral/flutter_lldbinit

@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py

pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
   async: ^2.11.0
   badges: ^3.1.2
   blurhash_dart: ^1.2.1
-  chewie: ^1.8.1
+  chewie: ^1.11.0
   collection: ^1.18.0
   cross_file: ^0.3.4+2
   cupertino_icons: any