From 177f063c80fef4c0d221e553cd9b957ff4042201 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 8 May 2025 10:21:18 -0400 Subject: [PATCH 1/7] Remove firebase setup on login --- lib/utils/background_push.dart | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 7dd1eab8d..cab3cdc4d 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -21,12 +21,15 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:fluffychat/pangea/common/utils/error_handler.dart'; +import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; +import 'package:fluffychat/utils/push_helper.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_new_badger/flutter_new_badger.dart'; @@ -35,10 +38,6 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:unifiedpush_ui/unifiedpush_ui.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart'; @@ -82,8 +81,6 @@ class BackgroundPush { void _init() async { try { // #Pangea - onLogin ??= - client.onLoginStateChanged.stream.listen(handleLoginStateChanged); FirebaseMessaging.instance.getInitialMessage().then(_onOpenNotification); FirebaseMessaging.onMessageOpenedApp.listen(_onOpenNotification); // Pangea# From 1abd060b7b1a28a9b0c2d519c8c1f608a089861a Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 8 May 2025 10:53:28 -0400 Subject: [PATCH 2/7] Stop chat list push instead --- lib/pages/chat_list/chat_list.dart | 30 +++++++++++++++--------------- lib/utils/background_push.dart | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index d24d87191..2bd69f6f1 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -1,18 +1,7 @@ import 'dart:async'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - import 'package:app_links/app_links.dart'; import 'package:cross_file/cross_file.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart' as sdk; -import 'package:matrix/matrix.dart'; -import 'package:receive_sharing_intent/receive_sharing_intent.dart'; - import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; @@ -29,20 +18,29 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/show_scaffold_dialog.dart'; import 'package:fluffychat/utils/show_update_snackbar.dart'; +import 'package:fluffychat/utils/tor_stub.dart' + if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart' as sdk; +import 'package:matrix/matrix.dart'; +import 'package:receive_sharing_intent/receive_sharing_intent.dart'; + import '../../../utils/account_bundles.dart'; import '../../config/setting_keys.dart'; import '../../utils/url_launcher.dart'; import '../../widgets/matrix.dart'; -import 'package:fluffychat/utils/tor_stub.dart' - if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; - enum PopupMenuAction { settings, invite, @@ -494,7 +492,9 @@ class ChatListController extends State if (mounted) { searchServer = Matrix.of(context).store.getString(_serverStoreNamespace); - Matrix.of(context).backgroundPush?.setupPush(); + // #Pangea + // Matrix.of(context).backgroundPush?.setupPush(); + // Pangea# UpdateNotifier.showUpdateSnackBar(context); // #Pangea AppVersionUtil.showAppVersionDialog(context); diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index cab3cdc4d..1872a1a8f 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -81,6 +81,8 @@ class BackgroundPush { void _init() async { try { // #Pangea + onLogin ??= + client.onLoginStateChanged.stream.listen(handleLoginStateChanged); FirebaseMessaging.instance.getInitialMessage().then(_onOpenNotification); FirebaseMessaging.onMessageOpenedApp.listen(_onOpenNotification); // Pangea# From 9ba8dc5d9ced5359e79b51c78bd349ba34a94c72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 15:11:10 +0000 Subject: [PATCH 3/7] generated --- lib/pages/chat_list/chat_list.dart | 27 +++++++++++++++------------ lib/utils/background_push.dart | 13 +++++++------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 2bd69f6f1..e933544c2 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -1,7 +1,18 @@ import 'dart:async'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + import 'package:app_links/app_links.dart'; import 'package:cross_file/cross_file.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart' as sdk; +import 'package:matrix/matrix.dart'; +import 'package:receive_sharing_intent/receive_sharing_intent.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; @@ -18,29 +29,21 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/show_scaffold_dialog.dart'; import 'package:fluffychat/utils/show_update_snackbar.dart'; -import 'package:fluffychat/utils/tor_stub.dart' - if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart' as sdk; -import 'package:matrix/matrix.dart'; -import 'package:receive_sharing_intent/receive_sharing_intent.dart'; - import '../../../utils/account_bundles.dart'; import '../../config/setting_keys.dart'; import '../../utils/url_launcher.dart'; import '../../widgets/matrix.dart'; +import 'package:fluffychat/utils/tor_stub.dart' + if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; + + enum PopupMenuAction { settings, invite, diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 1872a1a8f..7dd1eab8d 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -21,15 +21,12 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_new_badger/flutter_new_badger.dart'; @@ -38,6 +35,10 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:unifiedpush_ui/unifiedpush_ui.dart'; +import 'package:fluffychat/pangea/common/utils/error_handler.dart'; +import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; +import 'package:fluffychat/utils/push_helper.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart'; From 4c9912aa604af346978f126fe030b844aa6355e2 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 20 May 2025 14:44:25 -0400 Subject: [PATCH 4/7] Remove login firebase setup, restore chat list firebase setup --- lib/pages/chat_list/chat_list.dart | 4 +--- lib/utils/background_push.dart | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 103d6ecfb..30b500845 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -488,9 +488,7 @@ class ChatListController extends State if (mounted) { searchServer = Matrix.of(context).store.getString(_serverStoreNamespace); - // #Pangea - // Matrix.of(context).backgroundPush?.setupPush(); - // Pangea# + Matrix.of(context).backgroundPush?.setupPush(); UpdateNotifier.showUpdateSnackBar(context); // #Pangea AppVersionUtil.showAppVersionDialog(context); diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 9553c4a2e..b5772c961 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -81,8 +81,6 @@ class BackgroundPush { void _init() async { try { // #Pangea - onLogin ??= - client.onLoginStateChanged.stream.listen(handleLoginStateChanged); FirebaseMessaging.instance.getInitialMessage().then(_onOpenNotification); FirebaseMessaging.onMessageOpenedApp.listen(_onOpenNotification); // Pangea# From b8fd99c05a70cd75f1c080345303d546ce898bbe Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 22 May 2025 12:56:39 -0400 Subject: [PATCH 5/7] Revert "Remove firebase setup on login" This reverts commit 177f063c80fef4c0d221e553cd9b957ff4042201. --- lib/utils/background_push.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 25fe2520d..804736a26 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -82,6 +82,8 @@ class BackgroundPush { void _init() async { try { // #Pangea + onLogin ??= + client.onLoginStateChanged.stream.listen(handleLoginStateChanged); FirebaseMessaging.instance.getInitialMessage().then(_onOpenNotification); FirebaseMessaging.onMessageOpenedApp.listen(_onOpenNotification); // Pangea# From c315947aa1df7a5b673de37b2d555f6e47f1f3b3 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 22 May 2025 13:13:44 -0400 Subject: [PATCH 6/7] Remove firebase setup on login --- lib/utils/background_push.dart | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 804736a26..b5772c961 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -21,12 +21,15 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:fluffychat/pangea/common/utils/error_handler.dart'; +import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; +import 'package:fluffychat/utils/push_helper.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_new_badger/flutter_new_badger.dart'; @@ -35,10 +38,6 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:unifiedpush_ui/unifiedpush_ui.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart'; @@ -82,8 +81,6 @@ class BackgroundPush { void _init() async { try { // #Pangea - onLogin ??= - client.onLoginStateChanged.stream.listen(handleLoginStateChanged); FirebaseMessaging.instance.getInitialMessage().then(_onOpenNotification); FirebaseMessaging.onMessageOpenedApp.listen(_onOpenNotification); // Pangea# From 32cd7afdb98e81b0d6c13a80ce2164de320c0e5d Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 22 May 2025 14:10:58 -0400 Subject: [PATCH 7/7] Formatting --- lib/pages/chat_list/chat_list.dart | 1 - lib/utils/background_push.dart | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 57676e07c..df76ce4b0 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -44,7 +44,6 @@ import '../../widgets/matrix.dart'; import 'package:fluffychat/utils/tor_stub.dart' if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; - enum PopupMenuAction { settings, invite, diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index b5772c961..25fe2520d 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -21,15 +21,12 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_new_badger/flutter_new_badger.dart'; @@ -38,6 +35,10 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:unifiedpush_ui/unifiedpush_ui.dart'; +import 'package:fluffychat/pangea/common/utils/error_handler.dart'; +import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; +import 'package:fluffychat/utils/push_helper.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart';