Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TF-3361 clear notification and badge number #3384

Open
wants to merge 4 commits into
base: maintenance-v0.14.2
Choose a base branch
from
+38 −72
Open

TF-3361 clear notification and badge number #3384

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1371058
TF-3361 Clear all notifications and badge number on opening app
tddang-linagora Dec 27, 2024
c153449
TF-3361 Only show badge number for EmailDelivery push
tddang-linagora Dec 27, 2024
0d5c55b
fixup! TF-3361 Only show badge number for EmailDelivery push
tddang-linagora Dec 27, 2024
5a5d306
fixup! TF-3361 Only show badge number for EmailDelivery push
tddang-linagora Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import flutter_local_notifications
GeneratedPluginRegistrant.register(with: self)

createNotificationInteractionChannel()
clearApplicationNotification()

if let payload = launchOptions?[.remoteNotification] as? [AnyHashable : Any],
let emailId = payload[JmapConstants.EMAIL_ID] as? String,
Expand Down Expand Up @@ -68,7 +69,7 @@ import flutter_local_notifications
}

override func applicationDidBecomeActive(_ application: UIApplication) {
removeAppBadger()
clearApplicationNotification()
}

private func handleEmailAndress(open url: URL) -> URL? {
Expand Down Expand Up @@ -126,6 +127,13 @@ import flutter_local_notifications
}
return false
}

private func clearApplicationNotification() {
removeAppBadger()
let userNotificationCenter = UNUserNotificationCenter.current()
userNotificationCenter.removeAllDeliveredNotifications()
userNotificationCenter.removeAllPendingNotificationRequests()
}
}

extension AppDelegate {
Expand Down
2 changes: 1 addition & 1 deletion ios/TwakeMailNSE/NotificationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class NotificationService: UNNotificationServiceExtension {
return self.notify()
}

guard let oldEmailDeliveryState = keychainSharingSession.emailDeliveryState ?? keychainSharingSession.emailState,
guard let oldEmailDeliveryState = keychainSharingSession.emailDeliveryState,
newEmailDeliveryState != oldEmailDeliveryState else {
self.showDefaultNotification(message: NSLocalizedString(self.newEmailDefaultMessageKey, comment: "Localizable"))
return self.notify()
Expand Down
2 changes: 2 additions & 0 deletions lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ import 'package:tmail_ui_user/features/push_notification/domain/usecases/delete_
import 'package:tmail_ui_user/features/push_notification/domain/usecases/delete_mailbox_state_to_refresh_interactor.dart';
import 'package:tmail_ui_user/features/push_notification/domain/usecases/get_email_state_to_refresh_interactor.dart';
import 'package:tmail_ui_user/features/push_notification/domain/usecases/get_mailbox_state_to_refresh_interactor.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/controller/web_socket_controller.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
Expand Down Expand Up @@ -2971,6 +2972,7 @@ class MailboxDashBoardController extends ReloadableController
mapMailboxById = {};
mapDefaultMailboxIdByRole = {};
WebSocketController.instance.onClose();
FcmMessageController.instance.onClose();
_currentEmailState = null;
super.onClose();
}
Expand Down
21 changes: 21 additions & 0 deletions lib/features/push_notification/presentation/controller/fcm_message_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
Expand All @@ -32,6 +33,7 @@ import 'package:tmail_ui_user/features/push_notification/presentation/controller
import 'package:tmail_ui_user/features/push_notification/presentation/extensions/state_change_extension.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/listener/email_change_listener.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/listener/mailbox_change_listener.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/utils/fcm_utils.dart';
import 'package:tmail_ui_user/main/bindings/main_bindings.dart';
Expand All @@ -47,6 +49,7 @@ class FcmMessageController extends PushBaseController {
TokenOidcCacheManager? _tokenOidcCacheManager;
StateCacheManager? _stateCacheManager;
AuthenticationInfoCacheManager? _authenticationInfoCacheManager;
AppLifecycleListener? _appLifecycleListener;

FcmMessageController._internal();

Expand All @@ -60,6 +63,24 @@ class FcmMessageController extends PushBaseController {

_listenTokenStream();
_listenBackgroundMessageStream();
LocalNotificationManager.instance.clearAllNotifications();
_listenAppLifecycle();
}

@override
void onClose() {
_appLifecycleListener?.dispose();
super.onClose();
}

void _listenAppLifecycle() {
_appLifecycleListener = AppLifecycleListener(
onStateChange: (appLifecycleState) {
if (appLifecycleState == AppLifecycleState.resumed) {
LocalNotificationManager.instance.clearAllNotifications();
}
},
);
}

void _listenBackgroundMessageStream() {
Expand Down
2 changes: 1 addition & 1 deletion lib/features/push_notification/presentation/controller/push_base_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ abstract class PushBaseController {
.toList();

final listEmailActions = listTypeName
.where((typeName) => typeName == TypeName.emailType || typeName == TypeName.emailDelivery)
.where((typeName) => typeName == TypeName.emailDelivery)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you made a mistake here. _toPushNotificationAction is a function that converts to many actions, not just PushNotification. Please check it again carefully.

Screenshot 2025-01-02 at 14 33 43

.map((typeName) => _toPushNotificationAction(typeName, accountId, userName, mapTypeState, isForeground, session: session))
.whereNotNull()
.toList();
Expand Down
4 changes: 4 additions & 0 deletions lib/features/push_notification/presentation/notification/local_notification_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,8 @@ class LocalNotificationManager {
void closeStream() {
localNotificationsController.close();
}

Future<void> clearAllNotifications() async {
_localNotificationsPlugin.cancelAll();
}
}
69 changes: 0 additions & 69 deletions test/features/push_notification/presentation/controller/push_base_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,75 +36,6 @@ void main() {
final emailChangeListener = MockEmailChangeListener();
final mailboxChangeListener = MockMailboxChangeListener();

test(
'should call emailChangeListener.dispatchActions with SynchronizeEmailOnForegroundAction '
'when mapTypeState contains emailType '
'and isForeground is true',
() {
// arrange
final state = State('some-state');
final mapTypeState = {TypeName.emailType.value: state.value};

// act
final pushBaseController = TestPushController();
pushBaseController.mappingTypeStateToAction(
mapTypeState,
accountId,
userName,
isForeground: true,
emailChangeListener: emailChangeListener,
mailboxChangeListener: mailboxChangeListener
);

// assert
verify(
emailChangeListener.dispatchActions([
SynchronizeEmailOnForegroundAction(
TypeName.emailType,
state,
accountId,
null,
),
]),
).called(1);
verifyNever(mailboxChangeListener.dispatchActions(any));
});

test(
'should call emailChangeListener.dispatchActions with StoreEmailStateToRefreshAction '
'when mapTypeState contains emailType '
'and isForeground is false',
() {
// arrange
final state = State('some-state');
final mapTypeState = {TypeName.emailType.value: state.value};

// act
final pushBaseController = TestPushController();
pushBaseController.mappingTypeStateToAction(
mapTypeState,
accountId,
userName,
isForeground: false,
emailChangeListener: emailChangeListener,
mailboxChangeListener: mailboxChangeListener
);

// assert
verify(
emailChangeListener.dispatchActions([
StoreEmailStateToRefreshAction(
TypeName.emailType,
state,
accountId,
userName,
null,
),
]),
).called(1);
verifyNever(mailboxChangeListener.dispatchActions(any));
});

test(
'should call emailChangeListener.dispatchActions with nothing '
'when mapTypeState contains emailDelivery '
Expand Down
Loading