Merge pull request #71 from mindbox-cloud/release/2.8.3

sergeysozinov · web-flow · commit 6fd6f5aa6b49 · 2024-02-29T15:19:57.000+03:00
Release/2.8.3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -140,3 +140,6 @@ jobs:
           release_name: mindbox v${{ env.VERSION }}
           draft: false
           prerelease: false
+
+      - name: Version Upgrade
+        run: ./version-update.sh "${{ env.VERSION }}"
diff --git a/README.md b/README.md
@@ -0,0 +1,47 @@
+[![PubDev](https://img.shields.io/pub/v/mindbox)](https://pub.dev/packages/mindbox)
+
+# Mindbox SDK for Flutter
+
+The Mindbox SDK allows you to integrate mobile push-notifications, in-app messages and client events into your Flutter projects.
+
+## Getting Started
+
+These instructions will help you integrate the Mindbox SDK into your Flutter app.
+
+### Installation
+
+To integrate Mindbox SDK into your Flutter app, follow the installation process detailed [here](https://developers.mindbox.ru/docs/add-sdk-flutter). Here is an overview:
+
+Add Mindbox's dependency to your pubspec.yaml file:
+```markdown
+   dependencies:
+flutter:
+sdk: flutter
+mindbox: ^2.8.2
+```
+
+### Initialization
+
+Initialize the Mindbox SDK in your Activity or Application class. Check documentation [here](https://developers.mindbox.ru/docs/sdk-initialization-flutter) for more details.
+
+### Operations
+
+Learn how to send events to Mindbox. Create a new Operation class object and set the respective parameters. Check the [documentation](https://developers.mindbox.ru/docs/integration-actions-flutter) for more details.
+
+### Push Notifications
+
+Mindbox SDK helps handle push notifications. Configuration and usage instructions can be found in the SDK documentation [here](https://developers.mindbox.ru/docs/firebase-send-push-notifications-flutter),  [here](https://developers.mindbox.ru/docs/huawei-send-push-notifications-flutter) and [here](https://developers.mindbox.ru/docs/ios-send-push-notifications-flutter).
+
+## Troubleshooting
+
+Refer to the [Example of integration(IOS)](https://github.com/mindbox-cloud/flutter-sdk/tree/develop/mindbox_ios/example) or [Example of integration(Android)](https://github.com/mindbox-cloud/flutter-sdk/tree/develop/mindbox_android/example) in case of any issues.
+
+## Further Help
+
+Reach out to us for further help and we'll be glad to assist.
+
+## License
+
+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.
diff --git a/mindbox/CHANGELOG.md b/mindbox/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.8.3
+
+* Upgrade iOS SDK dependency to v2.8.3.
+* Upgrade Android SDK dependency to v2.8.4.
+* Added opportunity for turn off automatically request notification permission on start app in iOS
+* Added method *updateNotificationPermissionStatus*
+
+
 ## 2.8.2
 
 * Upgrade iOS SDK dependency to v2.8.2.
diff --git a/mindbox/lib/mindbox.dart b/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);
+  }
 }
diff --git a/mindbox/pubspec.yaml b/mindbox/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mindbox
 description: Flutter Mindbox SDK. Plugin wrapper over of Mindbox iOS/Android SDK.
-version: 2.8.2
+version: 2.8.3
 homepage: https://mindbox.cloud/
 repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox
 documentation: https://developers.mindbox.ru/docs/flutter-sdk-integration
@@ -20,9 +20,9 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  mindbox_android: ^2.8.2
-  mindbox_ios: ^2.8.2
-  mindbox_platform_interface: ^2.8.2
+  mindbox_android: ^2.8.3
+  mindbox_ios: ^2.8.3
+  mindbox_platform_interface: ^2.8.3
 
 dev_dependencies:
   flutter_test:
diff --git a/mindbox_android/CHANGELOG.md b/mindbox_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.8.3
+
+* Upgrade native SDK dependency to v2.8.4
+
 ## 2.8.2
 
 * Technical update
diff --git a/mindbox_android/android/build.gradle b/mindbox_android/android/build.gradle
@@ -48,5 +48,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'cloud.mindbox:mobile-sdk:2.8.2'
+    api 'cloud.mindbox:mobile-sdk:2.8.4'
+    api 'cloud.mindbox:mindbox-firebase:2.8.4'
+    api 'cloud.mindbox:mindbox-huawei:2.8.4'
 }
diff --git a/mindbox_android/android/src/main/kotlin/cloud/mindbox/mindbox_android/MindboxAndroidPlugin.kt b/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()
             }
diff --git a/mindbox_android/lib/src/mindbox_android_platform.dart b/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);
+  }
 }
diff --git a/mindbox_android/pubspec.yaml b/mindbox_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mindbox_android
 description: The implementation of 'mindbox' plugin for the Android platform.
-version: 2.8.2
+version: 2.8.3
 homepage: https://mindbox.cloud/
 repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox_android
 
@@ -19,7 +19,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  mindbox_platform_interface: ^2.8.2
+  mindbox_platform_interface: ^2.8.3
 
 dev_dependencies:
   flutter_test:
diff --git a/mindbox_ios/CHANGELOG.md b/mindbox_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.8.3
+
+* Upgrade native SDK dependency to v2.8.3.
+
 ## 2.8.2
 
 * Upgrade native SDK dependency to v2.8.2.
diff --git a/mindbox_ios/ios/Classes/MindboxFlutterAppDelegate.m b/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
diff --git a/mindbox_ios/ios/Classes/MindboxFlutterAppDelegate.swift b/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
diff --git a/mindbox_ios/ios/Classes/SwiftMindboxIosPlugin.swift b/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)
         }
diff --git a/mindbox_ios/ios/mindbox_ios.podspec b/mindbox_ios/ios/mindbox_ios.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'mindbox_ios'
-  s.version          = '2.8.2'
+  s.version          = '2.8.3'
   s.summary          = 'Mindbox Flutter SDK'
   s.description      = <<-DESC
 The implementation of 'mindbox' plugin for the iOS platform
@@ -15,8 +15,8 @@ The implementation of 'mindbox' plugin for the iOS platform
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Mindbox', '2.8.2'
-  s.dependency 'MindboxNotifications', '2.8.2'
+  s.dependency 'Mindbox', '2.8.3'
+  s.dependency 'MindboxNotifications', '2.8.3'
   s.platform = :ios, '10.0'
 
   # Flutter.framework does not contain a i386 slice.
diff --git a/mindbox_ios/lib/src/mindbox_ios_platform.dart b/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);
+  }
 }
diff --git a/mindbox_ios/pubspec.yaml b/mindbox_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mindbox_ios
 description: The implementation of 'mindbox' plugin for the iOS platform.
-version: 2.8.2
+version: 2.8.3
 homepage: https://mindbox.cloud/
 repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox_ios
 
@@ -18,7 +18,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  mindbox_platform_interface: ^2.8.2
+  mindbox_platform_interface: ^2.8.3
 
 dev_dependencies:
   flutter_test:
diff --git a/mindbox_platform_interface/CHANGELOG.md b/mindbox_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.8.3
+
+* Upgrade native SDK dependency.
+
 ## 2.8.2
 
 * Upgrade native SDK dependency.
diff --git a/mindbox_platform_interface/lib/src/mindbox_platform.dart b/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');
 }
 
 
diff --git a/mindbox_platform_interface/lib/src/types/mindbox_method_handler.dart b/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 {
diff --git a/mindbox_platform_interface/pubspec.yaml b/mindbox_platform_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mindbox_platform_interface
 description: Mindbox platform interface.
-version: 2.8.2
+version: 2.8.3
 homepage: https://mindbox.cloud/
 repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox_platform_interface
 
diff --git a/version-update.sh b/version-update.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+VERSION=$1
+sed -i -e "s|mindbox: ^[0-9].[0-9].[0-9]|mindbox: ^${VERSION}|" README.md

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,7 @@ android {`
`48`	`48`
`49`	`49`	`dependencies {`
`50`	`50`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
`51`		`- implementation 'cloud.mindbox:mobile-sdk:2.8.2'`
	`51`	`+ api 'cloud.mindbox:mobile-sdk:2.8.4'`
	`52`	`+ api 'cloud.mindbox:mindbox-firebase:2.8.4'`
	`53`	`+ api 'cloud.mindbox:mindbox-huawei:2.8.4'`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ class MindboxAndroidPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Ne`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
	`155`	`+ "updateNotificationPermissionStatus" -> {`
	`156`	`+ Mindbox.updateNotificationPermissionStatus(context = context)`
	`157`	`+ }`
`155`	`158`	`else -> {`
`156`	`159`	`result.notImplemented()`
`157`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,10 @@ class MindboxAndroidPlatform extends MindboxPlatform {`
`95`	`95`	`void registerInAppCallbacks({required List<InAppCallback> inAppCallbacks}) {`
`96`	`96`	`_methodHandler.registerInAppCallbacks(callbacks: inAppCallbacks);`
`97`	`97`	`}`
	`98`	`+`
	`99`	`+ // Method for to send notification permission status`
	`100`	`+ @override`
	`101`	`+ void updateNotificationPermissionStatus({required bool granted}) {`
	`102`	`+ _methodHandler.updateNotificationPermissionStatus(granted: granted);`
	`103`	`+ }`
`98`	`104`	`}`