diff --git a/env.file b/env.file index 8cd815032..6c44a3be4 100644 --- a/env.file +++ b/env.file @@ -3,4 +3,4 @@ DOMAIN_REDIRECT_URL=http://localhost:3000 WEB_OIDC_CLIENT_ID=teammail-web APP_GRID_AVAILABLE=supported FCM_AVAILABLE=supported -IOS_FCM=unsupported \ No newline at end of file +IOS_FCM=supported \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7d0497053..25b31c90d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -47,30 +47,30 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (10.1.0): - - FirebaseCore (= 10.1.0) - - Firebase/Messaging (10.1.0): + - Firebase/CoreOnly (10.3.0): + - FirebaseCore (= 10.3.0) + - Firebase/Messaging (10.3.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.1.0) - - firebase_core (2.2.0): - - Firebase/CoreOnly (= 10.1.0) + - FirebaseMessaging (~> 10.3.0) + - firebase_core (2.4.0): + - Firebase/CoreOnly (= 10.3.0) - Flutter - - firebase_messaging (14.0.4): - - Firebase/Messaging (= 10.1.0) + - firebase_messaging (14.1.4): + - Firebase/Messaging (= 10.3.0) - firebase_core - Flutter - - FirebaseCore (10.1.0): + - FirebaseCore (10.3.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.2.0): + - FirebaseCoreInternal (10.3.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.2.0): + - FirebaseInstallations (10.3.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.1.0): + - FirebaseMessaging (10.3.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -132,15 +132,15 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (7.10.0): - GoogleUtilities/Logger - - libwebp (1.2.3): - - libwebp/demux (= 1.2.3) - - libwebp/mux (= 1.2.3) - - libwebp/webp (= 1.2.3) - - libwebp/demux (1.2.3): + - libwebp (1.2.4): + - libwebp/demux (= 1.2.4) + - libwebp/mux (= 1.2.4) + - libwebp/webp (= 1.2.4) + - libwebp/demux (1.2.4): - libwebp/webp - - libwebp/mux (1.2.3): + - libwebp/mux (1.2.4): - libwebp/demux - - libwebp/webp (1.2.3) + - libwebp/webp (1.2.4) - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) - Mantle/extobjc (2.2.0) @@ -160,9 +160,9 @@ PODS: - ReachabilitySwift (5.0.0) - receive_sharing_intent (0.0.1): - Flutter - - SDWebImage (5.13.3): - - SDWebImage/Core (= 5.13.3) - - SDWebImage/Core (5.13.3) + - SDWebImage (5.14.2): + - SDWebImage/Core (= 5.14.2) + - SDWebImage/Core (5.14.2) - SDWebImageWebPCoder (0.9.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.13) @@ -295,13 +295,13 @@ SPEC CHECKSUMS: DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 - Firebase: 444b35a9c568a516666213c2f6cccd10cb12559f - firebase_core: d2242c6f318db1d0dcecfbfa491e943337b0d755 - firebase_messaging: 9b704e183cbcc36120b4744eb966c1947baf47a6 - FirebaseCore: 55e7ae35991ccca4db03ff8d8df6ed5f17a3e4c7 - FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f - FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f - FirebaseMessaging: 4487bbff9b9b927ba1dd3ea40d1ceb58e4ee3cb5 + Firebase: f92fc551ead69c94168d36c2b26188263860acd9 + firebase_core: 6f2f753e316765799d88568232ed59e300ff53db + firebase_messaging: 4b60bd563e1d21e3fe91afd398b59d0eda79cc60 + FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a + FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b + FirebaseInstallations: e2f26126089dcf41e215f7b8925af8d953c7d602 + FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_appauth: 05c3778a1e4ae23364dd2ef37cbae14b244f646b @@ -315,7 +315,7 @@ SPEC CHECKSUMS: FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 - libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c + libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c @@ -325,7 +325,7 @@ SPEC CHECKSUMS: PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1 - SDWebImage: af5bbffef2cde09f148d826f9733dcde1a9414cd + SDWebImage: b9a731e1d6307f44ca703b3976d18c24ca561e84 SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0 share: 0b2c3e82132f5888bccca3351c504d0003b3b410 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 191b695df..b297e13eb 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -2,6 +2,7 @@ import UIKit import Flutter import flutter_downloader import receive_sharing_intent +import flutter_local_notifications @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { @@ -9,7 +10,17 @@ import receive_sharing_intent _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { + + FlutterLocalNotificationsPlugin.setPluginRegistrantCallback { (registry) in + GeneratedPluginRegistrant.register(with: registry) + } + + if #available(iOS 10.0, *) { + UNUserNotificationCenter.current().delegate = self as UNUserNotificationCenterDelegate + } + GeneratedPluginRegistrant.register(with: self) + FlutterDownloaderPlugin.setPluginRegistrantCallback { registry in if (!registry.hasPlugin("FlutterDownloaderPlugin")) { FlutterDownloaderPlugin.register(with: registry.registrar(forPlugin: "FlutterDownloaderPlugin")!) diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 60fa16f29..dde660a17 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -39,8 +39,8 @@ CFBundleVersion $(FLUTTER_BUILD_NUMBER) - FirebaseMessagingAutoInitEnabled - + FirebaseAppDelegateProxyEnabled + 0 LSApplicationQueriesSchemes https diff --git a/lib/features/push_notification/presentation/notification/local_notification_manager.dart b/lib/features/push_notification/presentation/notification/local_notification_manager.dart index ba67de4e4..6b399c74b 100644 --- a/lib/features/push_notification/presentation/notification/local_notification_manager.dart +++ b/lib/features/push_notification/presentation/notification/local_notification_manager.dart @@ -133,8 +133,8 @@ class LocalNotificationManager { await _localNotificationsPlugin.show( id.hashCode, - null, - null, + title, + message, LocalNotificationConfig.instance.generateNotificationDetails(styleInformation: inboxStyleInformation), payload: payload ); diff --git a/pubspec.lock b/pubspec.lock index 1d846a2f7..b7ca04234 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: _flutterfire_internals url: "https://pub.dartlang.org" source: hosted - version: "1.0.8" + version: "1.0.10" analyzer: dependency: transitive description: @@ -154,14 +154,14 @@ packages: name: cloud_firestore_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.8.5" + version: "5.9.1" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "3.0.5" + version: "3.1.1" code_builder: dependency: transitive description: @@ -459,7 +459,7 @@ packages: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.4.0" firebase_core_platform_interface: dependency: transitive description: @@ -480,21 +480,21 @@ packages: name: firebase_messaging url: "https://pub.dartlang.org" source: hosted - version: "14.0.4" + version: "14.1.4" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.2.6" + version: "4.2.8" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web url: "https://pub.dartlang.org" source: hosted - version: "3.2.6" + version: "3.2.9" fixnum: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index fe82a395b..e8918f185 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -197,9 +197,9 @@ dependencies: url_launcher: 6.1.5 - firebase_core: 2.2.0 + firebase_core: 2.4.0 - firebase_messaging: 14.0.4 + firebase_messaging: 14.1.4 flutter_local_notifications: 12.0.3