Merge pull request #142 from mindbox-cloud/release/2.13.0

Bump SDK version to 2.13.0

Author: tradxxx

.github/workflows/analyze_and_test.yml

@@ -65,7 +65,22 @@ jobs:
       - run: cd mindbox_ios && flutter pub get
       - run: cd mindbox_ios && flutter analyze
       - run: cd mindbox_ios && flutter test
-   
+
+  example_flutter_test:
+    name: example running analyze
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v1
+        with:
+          java-version: "12.x"
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+
+      - name: lint example
+        run: cd example/flutter_example && flutter pub get && flutter analyze
+
   plugin_flutter_test:
     name:  plugin running analyze and tests
     runs-on: ubuntu-latest
@@ -77,7 +92,10 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          
+
+      - name: lint example
+        run: cd example/flutter_example && flutter pub get && flutter analyze
+
       - name: Add publish_to tag in mindbox_android
         run: |
          cd mindbox_android && echo "publish_to: 'none'" | cat - pubspec.yaml > temp && mv temp pubspec.yaml

.github/workflows/gitleaks-secrets-validate.yml

@@ -13,7 +13,7 @@ jobs:
           fetch-depth: 0
 
       - name: Run Gitleaks
-        uses: gitleaks/gitleaks-action@v2.3.4
+        uses: gitleaks/gitleaks-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITLEAKS_LICENSE: ${{ secrets.MINDBOX_GITLEAKS_LICENSE }} 

.github/workflows/pr-description-validate.yml

@@ -0,0 +1,57 @@
+name: Validate PR description is not empty
+
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  check-description:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repository
+      uses: actions/checkout@v4
+    
+    - name: Check PR description
+      id: validate_description_step
+      uses: actions/github-script@v7
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          const pr = context.payload.pull_request;
+          if (!pr || !pr.body || pr.body.trim().length === 0) {
+            core.setOutput('pr_description_check_passed', 'false');
+          } 
+          else {
+            core.setOutput('pr_description_check_passed', 'true');
+          }
+    - name: Find Comment
+      uses: peter-evans/find-comment@v3
+      id: fc
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-author: 'github-actions[bot]'
+
+    - name: Update comment with validation failed statement
+      if: ${{ steps.validate_description_step.outputs.pr_description_check_passed == 'false' }}
+      uses: peter-evans/create-or-update-comment@v4
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-id: ${{ steps.fc.outputs.comment-id }}
+        edit-mode: replace
+        body: |
+          ⚠️ **Пожалуйста, добавь описание к pull request.**
+          Описание pull request помогает лучше понять изменения, которые вы вносите, облегчает процесс ревью и поиска причин инцидентов.
+          Описание должно содержать **причину** изменений: какую **проблему** решаем, **зачем** делаем изменение, а не что изменилось.
+          Причина может быть в описании issue или в треде, тогда достаточно указать ссылку.
+          * Добавь ссылку на issue или тред, в котором раскрыта причина изменения
+          * Если требуется, коротко опиши зачем делаешь изменение, какую проблему решаешь
+          Спасибо!
+
+    - name: Fail the job if description is empty
+      if: ${{ steps.validate_description_step.outputs.pr_description_check_passed == 'false' }}
+      run: |
+        echo "⚠️ Ошибка: Пожалуйста, добавьте описание к pull request."
+        exit 1

.github/workflows/trigger-build-app.yml

@@ -20,16 +20,10 @@ jobs:
           commits=$(git log -3 --pretty=format:"%s")
           echo "commits=$commits" >> $GITHUB_ENV
 
-      - name: Get Flutter Mindbox SDK Version
-        run: |
-          sdkVersion=$(grep 'version:' mindbox/pubspec.yaml | awk '{print $2}')
-          echo "sdkVersion=$sdkVersion" >> $GITHUB_ENV
- 
       - name: Trigger build workflow in flutter-app repo
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          token: ${{ secrets.PAT_FLUTTER_APP }}
-          workflow: buildApplicationAfterTrigger.yml
-          repo: mindbox-cloud/flutter-app
-          ref: develop
-          inputs: '{"branch": "{{ github.head_ref }}", "commits": "${{ env.commits }}", "sdkVersion": "${{ env.sdkVersion }}"}'
+        run: |
+          curl --location 'https://mindbox.gitlab.yandexcloud.net/api/v4/projects/1089/trigger/pipeline' \
+            --form 'token="${{ secrets.GITLAB_TRIGGER_TOKEN }}"' \
+            --form 'ref="develop"' \
+            --form "variables[INPUT_BRANCH]=\"${{ github.head_ref }}\"" \
+            --form "variables[INPUT_COMMITS]=\"${{ env.commits }}\""

example/flutter_example/analysis_options.yaml

@@ -1,28 +1,31 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at https://dart.dev/lints.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    file_names: false
+    avoid_print: false
+    lines_longer_than_80_chars: false
+    cancel_subscriptions: true
+    constant_identifier_names: true
+    directives_ordering: false
+    empty_constructor_bodies: true
+    flutter_style_todos: true
+    implementation_imports: true
+    package_names: true
+    package_prefixed_library_names: true
+    prefer_final_locals: true
+    sort_child_properties_last: true
+    sort_constructors_first: true
+    sort_unnamed_constructors_first: true
+    type_annotate_public_apis: false
+    unnecessary_await_in_return: true
+    prefer_is_not_empty: true
+    avoid_empty_else: true
+    avoid_returning_null_for_void: true
+    no_duplicate_case_values: true
+    prefer_typing_uninitialized_variables: true
+    public_member_api_docs: false
+    always_put_control_body_on_new_line: true
+    curly_braces_in_flow_control_structures: true
 
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+# See lint rules here https://dart.dev/tools/linter-rules#lints

example/flutter_example/android/app/build.gradle

@@ -27,7 +27,7 @@ if (flutterVersionName == null) {
 android {
     namespace "cloud.mindbox.flutter_example"
     compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    ndkVersion "26.1.10909125"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,6 +51,15 @@ android {
         multiDexEnabled true
     }
 
+    signingConfigs {
+        debug {
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            storeFile file("debug.keystore")
+            keyPassword "android"
+        }
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.debug
@@ -63,7 +72,7 @@ flutter {
     source '../..'
 }
 
-ext.mindbox_version = "2.10.0"
+ext.mindbox_version = "2.13.0"
 
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -73,10 +82,13 @@ dependencies {
     implementation platform('com.google.firebase:firebase-bom:32.8.1')
     implementation 'com.google.firebase:firebase-messaging:23.4.1'
     //https://developers.mindbox.ru/docs/huawei-send-push-notifications-flutter
-    implementation "cloud.mindbox:mindbox-huawei"
+    implementation 'cloud.mindbox:mindbox-huawei'
     implementation 'com.huawei.hms:push:6.11.0.300'
     implementation 'com.google.code.gson:gson:2.8.8'
 
+    implementation 'cloud.mindbox:mindbox-rustore'
+    implementation 'ru.rustore.sdk:pushclient:6.5.1'
+
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1"
 }

example/flutter_example/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="cloud.mindbox.flutter_example">
 
     <application
@@ -18,6 +19,12 @@
             </intent-filter>
         </service>
 
+        <service android:name=".MindboxRuStoreMessagingService" android:exported="true" tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="ru.rustore.sdk.pushclient.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -45,6 +52,10 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
+        <meta-data
+            android:name="ru.rustore.sdk.pushclient.project_id"
+            android:value="MPYu6sSEZy8Vl-wYVkqFwwuaFNVlsBvx" />
+
     </application>
     <queries>
         <intent>

example/flutter_example/android/app/src/main/kotlin/cloud/mindbox/flutter_example/MainApplication.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import cloud.mindbox.mobile_sdk.Mindbox
 import cloud.mindbox.mindbox_firebase.MindboxFirebase
 import cloud.mindbox.mindbox_huawei.MindboxHuawei
+import cloud.mindbox.mindbox_rustore.MindboxRuStore
 import cloud.mindbox.mobile_sdk.pushes.MindboxRemoteMessage
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.EventChannel
@@ -20,7 +21,7 @@ class MainApplication : Application() {
     private val gson = Gson()
     override fun onCreate() {
         super.onCreate()
-        Mindbox.initPushServices(applicationContext, listOf(MindboxFirebase, MindboxHuawei))
+        Mindbox.initPushServices(applicationContext, listOf(MindboxFirebase, MindboxHuawei, MindboxRuStore))
     }
 
     fun setupEventChannel(flutterEngine: FlutterEngine) {

example/flutter_example/android/app/src/main/kotlin/cloud/mindbox/flutter_example/MindboxHuaweiMessagingService.kt

@@ -3,8 +3,12 @@ package cloud.mindbox.flutter_example
 import cloud.mindbox.mobile_sdk.Mindbox
 import com.huawei.hms.push.*
 import cloud.mindbox.mindbox_huawei.MindboxHuawei
+import kotlinx.coroutines.*
 
 class MindboxHuaweiMessagingService: HmsMessageService() {
+
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         Mindbox.updatePushToken(applicationContext, token, MindboxHuawei)
@@ -17,31 +21,40 @@ class MindboxHuaweiMessagingService: HmsMessageService() {
         val channelDescription = "default_channel_description"
         val pushSmallIcon = android.R.drawable.ic_dialog_info
 
-        val messageWasHandled = Mindbox.handleRemoteMessage(
-            context = applicationContext,
-            message = remoteMessage,
-            activities = mapOf(),
-            channelId = channelId,
-            channelName = channelName,
-            pushSmallIcon = pushSmallIcon,
-            defaultActivity = MainActivity::class.java,
-            channelDescription = channelDescription
-        )
-
-        // Method for checking if push is from Mindbox
-        val isMindboxPush = MindboxHuawei.isMindboxPush(remoteMessage = remoteMessage)
-
-        // Method for getting info from Mindbox push
-        val mindboxMessage = MindboxHuawei.convertToMindboxRemoteMessage(remoteMessage = remoteMessage)
-        // If you want to save the notification you can call your save function from here.
-        mindboxMessage?.let {
-            val app = applicationContext as MainApplication
-            app.saveNotification(it)
-        }
-
-        if (!messageWasHandled) {
-            //If the push notification was not from Mindbox or it contains incorrect data, then you can write a fallback to process it
+        // On some devices, onMessageReceived may be executed on the main thread
+        // We recommend handling push messages asynchronously
+        coroutineScope.launch {
+            val messageWasHandled = Mindbox.handleRemoteMessage(
+                context = applicationContext,
+                message = remoteMessage,
+                activities = mapOf(),
+                channelId = channelId,
+                channelName = channelName,
+                pushSmallIcon = pushSmallIcon,
+                defaultActivity = MainActivity::class.java,
+                channelDescription = channelDescription
+            )
+
+            // Method for checking if push is from Mindbox
+            val isMindboxPush = MindboxHuawei.isMindboxPush(remoteMessage = remoteMessage)
+
+            // Method for getting info from Mindbox push
+            val mindboxMessage =
+                MindboxHuawei.convertToMindboxRemoteMessage(remoteMessage = remoteMessage)
+            // If you want to save the notification you can call your save function from here.
+            mindboxMessage?.let {
+                val app = applicationContext as MainApplication
+                app.saveNotification(it)
+            }
+
+            if (!messageWasHandled) {
+                //If the push notification was not from Mindbox or it contains incorrect data, then you can write a fallback to process it
+            }
         }
+    }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        coroutineScope.cancel()
     }
 }