TF-2871 Handle click notification to open detailed email on iOS
This commit is contained in:
@@ -270,7 +270,7 @@ class FcmMessageController extends FcmBaseController {
|
||||
_dynamicUrlInterceptors?.changeBaseUrl(apiUrl);
|
||||
|
||||
_pushActionFromRemoteMessageBackground(
|
||||
accountId: success.session.personalAccount.accountId,
|
||||
accountId: success.session.accountId,
|
||||
userName: success.session.username,
|
||||
stateChange: stateChange,
|
||||
session: success.session);
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:core/utils/broadcast_channel/broadcast_channel.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
|
||||
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
@@ -23,7 +21,6 @@ class FcmReceiver {
|
||||
|
||||
static FcmReceiver get instance => _instance;
|
||||
|
||||
static const notificationInteractionChannel = MethodChannel('notification_interaction_channel');
|
||||
static const int MAX_COUNT_RETRY_TO_GET_FCM_TOKEN = 3;
|
||||
|
||||
int _countRetryToGetFcmToken = 0;
|
||||
@@ -36,24 +33,11 @@ class FcmReceiver {
|
||||
if (PlatformInfo.isWeb) {
|
||||
_onMessageBroadcastChannel();
|
||||
await _requestNotificationPermissionOnWeb();
|
||||
} else if (PlatformInfo.isIOS) {
|
||||
_setUpIOSNotificationInteraction();
|
||||
await _onHandleFcmToken();
|
||||
} else {
|
||||
await _onHandleFcmToken();
|
||||
}
|
||||
}
|
||||
|
||||
void _setUpIOSNotificationInteraction() {
|
||||
notificationInteractionChannel.setMethodCallHandler((call) async {
|
||||
log('FcmReceiver::_setUpIOSNotificationInteraction:notificationInteractionChannel: $call');
|
||||
if (call.method == 'openEmail' && call.arguments is String) {
|
||||
log('FcmReceiver::_setUpIOSNotificationInteraction:openEmail with id = ${call.arguments}');
|
||||
FcmService.instance.handleOpenEmailFromNotification(call.arguments);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _requestNotificationPermissionOnWeb() async {
|
||||
NotificationSettings notificationSetting = await FirebaseMessaging.instance.getNotificationSettings();
|
||||
log('FcmReceiver::_requestNotificationPermissionOnWeb: authorizationStatus = ${notificationSetting.authorizationStatus}');
|
||||
@@ -118,18 +102,4 @@ class FcmReceiver {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>?> getIOSInitialNotificationInfo() async {
|
||||
try {
|
||||
final notificationInfo = await notificationInteractionChannel.invokeMethod('getInitialNotificationInfo');
|
||||
log('FcmReceiver::getIOSInitialNotificationInfo:notificationInfo: $notificationInfo');
|
||||
if (notificationInfo != null && notificationInfo is Map<String, dynamic>) {
|
||||
return notificationInfo;
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
logError('FcmReceiver::getIOSInitialNotificationInfo: Exception: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,12 +4,7 @@ import 'dart:convert';
|
||||
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:tmail_ui_user/features/push_notification/presentation/model/broadcast_message_event_data.dart';
|
||||
import 'package:tmail_ui_user/main/routes/app_routes.dart';
|
||||
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||
import 'package:tmail_ui_user/main/routes/route_utils.dart';
|
||||
import 'package:universal_html/html.dart' as html;
|
||||
|
||||
class FcmService {
|
||||
@@ -63,14 +58,6 @@ class FcmService {
|
||||
fcmTokenStreamController = StreamController<String?>.broadcast();
|
||||
}
|
||||
|
||||
void handleOpenEmailFromNotification(String emailId) {
|
||||
log('FcmService::handleOpenEmailFromNotification:emailId: $emailId');
|
||||
popAndPush(
|
||||
RouteUtils.generateNavigationRoute(AppRoutes.home),
|
||||
arguments: EmailId(Id(emailId))
|
||||
);
|
||||
}
|
||||
|
||||
void closeStream() {
|
||||
foregroundMessageStreamController?.close();
|
||||
backgroundMessageStreamController?.close();
|
||||
|
||||
Reference in New Issue
Block a user