Merge pull request #462 from mindbox-cloud/release/2.10.0-rc

Release/2.10.0-rc

Author: AndreyEmtsov

.idea/kotlinc.xml

@@ -1,7 +1,6 @@
 ext {
-
     sdkDependencies = [
-        kotlin_stdlib: 'org.jetbrains.kotlin:kotlin-stdlib:1.4.20',
+        kotlin_stdlib: "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
         androidx_core_ktx: 'androidx.core:core-ktx:1.7.0',
         androidx_annotations: 'androidx.annotation:annotation:1.3.0',
         firebase_bom: 'com.google.firebase:firebase-bom:32.7.2',
@@ -12,7 +11,7 @@ ext {
         kotlinx_coroutines_core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2',
         kotlinx_coroutines_android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0',
         volley: 'com.android.volley:volley:1.2.1',
-        gson: 'com.google.code.gson:gson:2.8.7',
+        gson: 'com.google.code.gson:gson:2.8.9',
         room: 'androidx.room:room-runtime:2.5.1',
         room_ktx: 'androidx.room:room-ktx:2.5.1',
         room_compiler: 'androidx.room:room-compiler:2.5.1',
@@ -39,5 +38,4 @@ ext {
         robolectric: 'org.robolectric:robolectric:4.9',
         test_core: 'androidx.test:core:1.5.0'
     ]
-
 }

dependencies.gradle

@@ -17,12 +17,6 @@ android {
         versionName "1.0"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -58,9 +52,9 @@ dependencies {
     implementation 'com.huawei.hms:push:6.11.0.300'
 
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.9.1'
-    implementation 'cloud.mindbox:mindbox-firebase:2.9.1'
-    implementation 'cloud.mindbox:mindbox-huawei:2.9.1'
+    implementation 'cloud.mindbox:mobile-sdk:2.10.0-rc'
+    implementation 'cloud.mindbox:mindbox-firebase:2.10.0-rc'
+    implementation 'cloud.mindbox:mindbox-huawei:2.10.0-rc'
 
     //Glade for custom loader
     implementation 'com.github.bumptech.glide:glide:4.15.1'

example/app/build.gradle

@@ -2,7 +2,7 @@ package com.mindbox.example
 
 import android.content.Context
 import android.util.Log
-import cloud.mindbox.mobile_sdk.pushes.RemoteMessage
+import cloud.mindbox.mobile_sdk.pushes.MindboxRemoteMessage
 import cloud.mindbox.mobile_sdk.pushes.handler.MessageHandlingState
 import cloud.mindbox.mobile_sdk.pushes.handler.image.ImageRetryStrategy
 import cloud.mindbox.mobile_sdk.pushes.handler.image.MindboxImageFailureHandler
@@ -13,7 +13,7 @@ class CustomImageFailureStrategy(
 ) : MindboxImageFailureHandler {
     override fun onImageLoadingFailed(
         context: Context,
-        message: RemoteMessage,
+        message: MindboxRemoteMessage,
         state: MessageHandlingState,
         error: Throwable
     ): ImageRetryStrategy = if (state.attemptNumber >= maxAttempts) {

example/app/src/main/java/com/mindbox/example/CustomImageFailureStrategy.kt

@@ -5,7 +5,7 @@ import android.graphics.Bitmap
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import cloud.mindbox.mobile_sdk.pushes.RemoteMessage
+import cloud.mindbox.mobile_sdk.pushes.MindboxRemoteMessage
 import cloud.mindbox.mobile_sdk.pushes.handler.MessageHandlingState
 import cloud.mindbox.mobile_sdk.pushes.handler.image.MindboxImageLoader
 import com.bumptech.glide.Glide
@@ -18,7 +18,7 @@ class CustomImageLoader : MindboxImageLoader {
 
     override fun onLoadImage(
         context: Context,
-        message: RemoteMessage,
+        message: MindboxRemoteMessage,
         state: MessageHandlingState
     ): Bitmap? {
         val imageUrl = message.imageUrl

example/app/src/main/java/com/mindbox/example/CustomImageLoader.kt

@@ -102,20 +102,27 @@ class MainActivity : AppCompatActivity() {
 
     private fun showSdkDataOnScreen() {
         //https://developers.mindbox.ru/docs/android-sdk-methods#subscribedeviceuuid-%D0%B8-disposedeviceuuidsubscription
-        val subscriptionDeviceUuid = Mindbox.subscribeDeviceUuid { deviceUUID ->
-            binding.tvDeviceUUIDResult.text = deviceUUID
+        var subscriptionDeviceUuid = ""
+        subscriptionDeviceUuid = Mindbox.subscribeDeviceUuid { deviceUUID ->
+            runOnUiThread {
+                binding.tvDeviceUUIDResult.text = deviceUUID
+            }
+            Mindbox.disposeDeviceUuidSubscription(subscriptionDeviceUuid)
         }
-        Mindbox.disposeDeviceUuidSubscription(subscriptionDeviceUuid)
+
         //https://developers.mindbox.ru/docs/android-sdk-methods#subscribepushtoken-%D0%B8-disposepushtokensubscription
-        val subscriptionPushToken =
+        var subscriptionPushToken = ""
+        subscriptionPushToken =
             Mindbox.subscribePushToken { token ->
-                binding.tvTokenResult.text = token
+                runOnUiThread {
+                    binding.tvTokenResult.text = token
+                    //https://developers.mindbox.ru/docs/android-sdk-methods#getpushtokensavedate
+                    binding.tvTokenDateResult.text = Mindbox.getPushTokenSaveDate()
+                }
+                Mindbox.disposePushTokenSubscription(subscriptionPushToken)
             }
-        Mindbox.disposePushTokenSubscription(subscriptionPushToken)
+
         //https://developers.mindbox.ru/docs/android-sdk-methods#getsdkversion
         binding.tvSdkVersionResult.text = Mindbox.getSdkVersion()
-        //https://developers.mindbox.ru/docs/android-sdk-methods#getpushtokensavedate
-        binding.tvTokenDateResult.text = Mindbox.getPushTokenSaveDate()
-
     }
 }

example/app/src/main/java/com/mindbox/example/MainActivity.kt

@@ -39,7 +39,7 @@ class MindboxFirebaseMessagingService : FirebaseMessagingService() {
 
         // Method for getting info from Mindbox push
         val mindboxMessage = MindboxFirebase.convertToMindboxRemoteMessage(remoteMessage = message)
-        Log.d(Utils.TAG, mindboxMessage)
+        Log.d(Utils.TAG, mindboxMessage.toString())
 
         if (!messageWasHandled) {
             // If the push notification was not from Mindbox or it contains incorrect data, you can write a fallback to process it.

example/app/src/main/java/com/mindbox/example/MindboxFirebaseMessagingServiceMyService.kt

@@ -49,7 +49,7 @@ class MindboxHuaweiMessagingService : HmsMessageService() {
 
         // Method for getting info from Mindbox push
         val mindboxMessage = MindboxHuawei.convertToMindboxRemoteMessage(remoteMessage = message)
-        Log.d(Utils.TAG, mindboxMessage)
+        Log.d(Utils.TAG, mindboxMessage.toString())
 
         if (!messageWasHandled) {
             // If the push notification was not from Mindbox or it contains incorrect data, you can write a fallback to process it.

example/app/src/main/java/com/mindbox/example/MindboxHuaweiMessagingService.kt

@@ -31,9 +31,15 @@ properties_file="gradle.properties"
 current_version=$(grep -E '^SDK_VERSION_NAME=' gradle.properties | cut -d'=' -f2)
 sed -i '' "s/^SDK_VERSION_NAME=.*/SDK_VERSION_NAME=$version/" $properties_file
 
+build_gradle_example_path="example/app/build.gradle"
+sed -i '' -E "s/cloud.mindbox:mobile-sdk:[0-9]+\.[0-9]+\.[0-9]+(-rc)?/cloud.mindbox:mobile-sdk:$version/" $build_gradle_example_path
+sed -i '' -E "s/cloud.mindbox:mindbox-firebase:[0-9]+\.[0-9]+\.[0-9]+(-rc)?/cloud.mindbox:mindbox-firebase:$version/" $build_gradle_example_path
+sed -i '' -E "s/cloud.mindbox:mindbox-huawei:[0-9]+\.[0-9]+\.[0-9]+(-rc)?/cloud.mindbox:mindbox-huawei:$version/" $build_gradle_example_path
+
 echo "Bump SDK version from $current_version to $version."
 
 git add $properties_file
+git add -f $build_gradle_example_path
 git commit -m "Bump SDK version to $version"
 
 echo "Branch $branch_name has been created."

git-release-branch.sh

@@ -3,7 +3,7 @@ set -e
 version=$(cat gradle.properties | grep SDK_VERSION_NAME | cut -f2 -d"=")
 token=$1
 user=$2
-branch=${GITHUB_REF##*/}
+branch=${GITHUB_REF#refs/heads/}
 repo_full_name=$(git config --get remote.origin.url | sed 's/.*:\/\/github.com\///;s/.git$//' | cut -f2 -d":")
 generate_post_data() {
   cat <<EOF