From 385482af3c6dc1a13e9d30697faf6b07d64d3ca0 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 24 Oct 2023 14:33:07 +0700 Subject: [PATCH] Remove config work manager in sending ios Signed-off-by: dab246 (cherry picked from commit 829a82c8649cad01fb9afc223259233533b767eb) --- ios/Runner/AppDelegate.swift | 9 +-------- ios/Runner/Info.plist | 4 ---- .../controller/mailbox_dashboard_controller.dart | 4 +--- .../offline_mode/config/work_manager_constants.dart | 1 - lib/features/offline_mode/work_manager/worker_type.dart | 8 -------- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index f293d82ca..0b33c5192 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -3,7 +3,6 @@ import Flutter import flutter_downloader import receive_sharing_intent import flutter_local_notifications -import workmanager @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { @@ -48,13 +47,7 @@ import workmanager } } } - - WorkmanagerPlugin.setPluginRegistrantCallback { registry in - AppDelegate.registerPlugins(with: registry) - } - - WorkmanagerPlugin.registerTask(withIdentifier: "com.linagora.ios.teammail.sendingQueue") - + return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 6c989cb47..5664f874b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -64,10 +64,6 @@ remote-notification processing - BGTaskSchedulerPermittedIdentifiers - - com.linagora.ios.teammail.sendingQueue - UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index 92e9f84df..a8ae3e8ad 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -1917,9 +1917,7 @@ class MailboxDashBoardController extends ReloadableController { void addSendingEmailToSendingQueue(SendingEmail sendingEmail) async { log('MailboxDashBoardController::addSendingEmailToSendingQueue():sendingEmail: $sendingEmail'); final work = OneTimeWorkRequest( - uniqueId: PlatformInfo.isAndroid - ? sendingEmail.sendingId - : WorkerType.sendingEmail.iOSUniqueId, + uniqueId: sendingEmail.sendingId, taskId: sendingEmail.sendingId, tag: WorkerType.sendingEmail.name, inputData: sendingEmail.toJson() diff --git a/lib/features/offline_mode/config/work_manager_constants.dart b/lib/features/offline_mode/config/work_manager_constants.dart index 6da0fc126..d53ab1531 100644 --- a/lib/features/offline_mode/config/work_manager_constants.dart +++ b/lib/features/offline_mode/config/work_manager_constants.dart @@ -1,6 +1,5 @@ class WorkManagerConstants { - static const String sendingEmailUniqueId = 'com.linagora.ios.teammail.sendingQueue'; static const String workerTypeKey = 'worker_type'; static const int delayTime = 2000; } \ No newline at end of file diff --git a/lib/features/offline_mode/work_manager/worker_type.dart b/lib/features/offline_mode/work_manager/worker_type.dart index c9647792a..c7c493f72 100644 --- a/lib/features/offline_mode/work_manager/worker_type.dart +++ b/lib/features/offline_mode/work_manager/worker_type.dart @@ -1,5 +1,4 @@ -import 'package:tmail_ui_user/features/offline_mode/config/work_manager_constants.dart'; import 'package:tmail_ui_user/features/offline_mode/work_manager/sending_email_worker.dart'; import 'package:tmail_ui_user/features/offline_mode/work_manager/worker.dart'; @@ -12,11 +11,4 @@ enum WorkerType { return SendingEmailWorker(); } } - - String get iOSUniqueId { - switch(this) { - case WorkerType.sendingEmail: - return WorkManagerConstants.sendingEmailUniqueId; - } - } } \ No newline at end of file