Merge branch 'develop' of https://github.com/mindbox-cloud/flutter-sdk into develop

# Conflicts:
#	.github/workflows/publish.yml
#	README.md

Author: sergeysozinov

README.md

@@ -44,4 +44,4 @@ Reach out to us for further help and we'll be glad to assist.
 
 The library is available as open source under the terms of the [License](https://github.com/mindbox-cloud/android-sdk/blob/develop/LICENSE.md).
 
-For a better understanding of this content, please familiarize yourself with the Mindbox [Flutter SDK](https://developers.mindbox.ru/docs/flutter-sdk-integration) documentation.
+For a better understanding of this content, please familiarize yourself with the Mindbox [Flutter SDK](https://developers.mindbox.ru/docs/flutter-sdk-integration) documentation.

mindbox/lib/mindbox.dart

@@ -137,4 +137,20 @@ class Mindbox {
   void registerInAppCallback({required List<InAppCallback> callbacks}) {
     MindboxPlatform.instance.registerInAppCallbacks(inAppCallbacks: callbacks);
   }
+
+  /// Updates the notification permission status.
+  ///
+  /// The [granted] parameter specifies whether the permission for notifications
+  /// has been granted:
+  ///
+  /// - `true` indicates that the user has granted permission.
+  /// - `false` indicates that the user has denied permission.
+  ///
+  /// Example usage:
+  /// ```dart
+  /// Mindbox.instance.updateNotificationPermissionStatus(granted: true);
+  void updateNotificationPermissionStatus({required bool granted}) {
+    MindboxPlatform.instance
+        .updateNotificationPermissionStatus(granted: granted);
+  }
 }

mindbox_android/android/src/main/kotlin/cloud/mindbox/mindbox_android/MindboxAndroidPlugin.kt

@@ -152,6 +152,9 @@ class MindboxAndroidPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Ne
                     }
                 }
             }
+            "updateNotificationPermissionStatus" -> {
+                Mindbox.updateNotificationPermissionStatus(context = context)
+            }
             else -> {
                 result.notImplemented()
             }

mindbox_android/lib/src/mindbox_android_platform.dart

@@ -95,4 +95,10 @@ class MindboxAndroidPlatform extends MindboxPlatform {
   void registerInAppCallbacks({required List<InAppCallback> inAppCallbacks}) {
     _methodHandler.registerInAppCallbacks(callbacks: inAppCallbacks);
   }
+
+  // Method for to send notification permission status
+  @override
+  void updateNotificationPermissionStatus({required bool granted}) {
+    _methodHandler.updateNotificationPermissionStatus(granted: granted);
+  }
 }

mindbox_ios/ios/Classes/MindboxFlutterAppDelegate.m

@@ -10,18 +10,22 @@ - (BOOL)application:(UIApplication *)application
     // MINDBOX INTEGRATION
     UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
     center.delegate = self;
-    [center requestAuthorizationWithOptions:(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-        if (!error) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [[UIApplication sharedApplication] registerForRemoteNotifications];
-                [[Mindbox shared] notificationsRequestAuthorizationWithGranted:granted];
-            });
-        }
-        else {
-            NSLog(@"NotificationsRequestAuthorization failed with error: %@", error.localizedDescription);
-        }
-    }];
-    
+    if ([self shouldRegisterForRemoteNotifications]) {
+        [center requestAuthorizationWithOptions:(UNAuthorizationOptionSound |
+                                                 UNAuthorizationOptionAlert |
+                                                 UNAuthorizationOptionBadge) completionHandler:^(
+                BOOL granted, NSError *_Nullable error) {
+            if (!error) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [[UIApplication sharedApplication] registerForRemoteNotifications];
+                    [[Mindbox shared] notificationsRequestAuthorizationWithGranted:granted];
+                });
+            } else {
+                NSLog(@"NotificationsRequestAuthorization failed with error: %@",
+                      error.localizedDescription);
+            }
+        }];
+    }
     // MINDBOX INTEGRATION
     if (@available(iOS 13.0, *)) {
         [[Mindbox shared] registerBGTasks];
@@ -61,4 +65,8 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNoti
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
     [[Mindbox shared] application:application performFetchWithCompletionHandler:completionHandler];
 }
+
+- (BOOL)shouldRegisterForRemoteNotifications {
+    return YES;
+}
 @end

mindbox_ios/ios/Classes/MindboxFlutterAppDelegate.swift

@@ -4,6 +4,11 @@ import Mindbox
 import MindboxNotifications
 
 open class MindboxFlutterAppDelegate: FlutterAppDelegate{
+
+    open func shouldRegisterForRemoteNotifications() -> Bool {
+            return true
+    }
+
     open override func application(
         _ application: UIApplication,
         didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
@@ -12,8 +17,10 @@ open class MindboxFlutterAppDelegate: FlutterAppDelegate{
         if #available(iOS 10.0, *) {
             UNUserNotificationCenter.current().delegate = self
         }
-        registerForRemoteNotifications()
-        
+
+        if shouldRegisterForRemoteNotifications() {
+            registerForRemoteNotifications()
+        }
         // Регистрация фоновых задач для iOS выше 13
         if #available(iOS 13.0, *) {
             Mindbox.shared.registerBGTasks()
@@ -45,7 +52,6 @@ open class MindboxFlutterAppDelegate: FlutterAppDelegate{
     //    MARK: registerForRemoteNotifications
     //    Функция запроса разрешения на уведомления. В комплишн блоке надо передать статус разрешения в SDK Mindbox
     func registerForRemoteNotifications() {
-        UNUserNotificationCenter.current().delegate = self
         DispatchQueue.main.async {
             UIApplication.shared.registerForRemoteNotifications()
             UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in

mindbox_ios/ios/Classes/SwiftMindboxIosPlugin.swift

@@ -159,6 +159,11 @@ public class SwiftMindboxIosPlugin: NSObject, FlutterPlugin {
             } else {
                 Mindbox.logger.log(level: .info, message: "Use default callback")
             }
+        case "updateNotificationPermissionStatus":
+           guard let granted = call.arguments as? Bool else {
+                  return
+           }
+           Mindbox.shared.notificationsRequestAuthorization(granted: granted)
         default:
             result(FlutterMethodNotImplemented)
         }

mindbox_ios/lib/src/mindbox_ios_platform.dart

@@ -95,4 +95,10 @@ class MindboxIosPlatform extends MindboxPlatform {
   void registerInAppCallbacks({required List<InAppCallback> inAppCallbacks}) {
     _methodHandler.registerInAppCallbacks(callbacks: inAppCallbacks);
   }
+
+  // Method for to send notification permission status
+  @override
+  void updateNotificationPermissionStatus({required bool granted}) {
+    _methodHandler.updateNotificationPermissionStatus(granted: granted);
+  }
 }

mindbox_platform_interface/lib/src/mindbox_platform.dart

@@ -118,6 +118,11 @@ abstract class MindboxPlatform {
   void setLogLevel({required LogLevel logLevel}) =>
       throw UnimplementedError(
           'setLogLevel() has not been implemented.');
+
+  /// Method for sending notification permission status
+  void updateNotificationPermissionStatus({required bool granted}) =>
+      throw UnimplementedError(
+          'updateNotificationPermissionStatus() has not been implemented');
 }
 
 

mindbox_platform_interface/lib/src/types/mindbox_method_handler.dart

@@ -110,6 +110,11 @@ class MindboxMethodHandler {
     await channel.invokeMethod('setLogLevel', logLevel.index);
   }
 
+  /// Method for sending notification permission status
+  void updateNotificationPermissionStatus({required bool granted}) async {
+    await channel.invokeMethod('updateNotificationPermissionStatus');
+  }
+
   /// Method for registers a list of InAppCallback instances to handle clicks
   /// and dismiss in in-apps.
   void registerInAppCallbacks({required List<InAppCallback> callbacks}) async {