Merge pull request #476 from mindbox-cloud/release/2.10.1

Release/2.10.1

Author: AndreyEmtsov

LICENSE.md

@@ -52,6 +52,6 @@ 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).
+The library is available as open source under the terms of the [License](https://github.com/mindbox-cloud/android-sdk/blob/master/LICENSE.md).
 
-For a better understanding of this content, please familiarize yourself with the Mindbox [Android SDK](https://developers.mindbox.ru/docs/androidhuawei-native-sdk) documentation.
+For a better understanding of this content, please familiarize yourself with the Mindbox [Android SDK](https://developers.mindbox.ru/docs/androidhuawei-native-sdk) documentation.

README.md

@@ -17,7 +17,7 @@ ext {
         room_compiler: 'androidx.room:room-compiler:2.5.1',
         work_manager: 'androidx.work:work-runtime-ktx:2.7.1',
         androidx_lifecycle: 'androidx.lifecycle:lifecycle-process:2.3.1',
-        hms_push: 'com.huawei.hms:push:6.5.0.300',
+        hms_push: 'com.huawei.hms:push:6.11.0.300',
         hms_ads_identifier: 'com.huawei.hms:ads-identifier:3.4.39.302',
         koin: 'io.insert-koin:koin-android:3.2.2',
         koin_test: 'io.insert-koin:koin-test:3.2.2',

dependencies.gradle

@@ -51,12 +51,16 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.huawei.hms:push:6.11.0.300'
 
+    implementation 'com.google.code.gson:gson:2.11.0'
+
+
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.10.0'
-    implementation 'cloud.mindbox:mindbox-firebase'
-    implementation 'cloud.mindbox:mindbox-huawei'
+    implementation 'cloud.mindbox:mobile-sdk:2.10.1'
+    implementation 'cloud.mindbox:mindbox-firebase:2.10.1'
+    implementation 'cloud.mindbox:mindbox-huawei:2.10.1'
 
     //Glade for custom loader
     implementation 'com.github.bumptech.glide:glide:4.15.1'
+    implementation 'androidx.activity:activity-ktx:1.9.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
 }

example/app/build.gradle

@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
+    <queries>
+        <intent>
+            <action android:name="com.huawei.hms.core.aidlservice" />
+        </intent>
+    </queries>
+
     <application
         android:name=".ExampleApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/Theme.MindboxAndroidSdkExample">
-        <meta-data
-            android:name="com.huawei.hms.client.channel.androidMarket"
-            android:value="false" />
+
+        <activity
+            android:name=".NotificationHistoryActivity"
+            android:exported="false" />
+
         <service
             android:name=".MindboxHuaweiMessagingService"
             android:enabled="true"
@@ -23,7 +29,6 @@
                 <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-
         <service
             android:name=".MindboxFirebaseMessagingService"
             android:enabled="true"
@@ -36,8 +41,7 @@
         <activity
             android:name=".ActivityTransitionByPush"
             android:exported="false"
-            android:launchMode="singleTask"/>
-
+            android:launchMode="singleTask" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -50,9 +54,4 @@
         </activity>
     </application>
 
-    <queries>
-        <intent>
-            <action android:name="com.huawei.hms.core.aidlservice" />
-        </intent>
-    </queries>
 </manifest>

example/app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@ class ActivityTransitionByPush : AppCompatActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
 
         //Get data from push after click on push or button in push

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

@@ -50,9 +50,13 @@ class MainActivity : AppCompatActivity() {
             val intent = Intent(this, ActivityTransitionByPush::class.java)
             this.startActivity(intent)
         }
+
+        binding.btnOpenPushList.setOnClickListener {
+            startActivity(Intent(this, NotificationHistoryActivity::class.java))
+        }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         processMindboxIntent(intent = intent, context = this)?.let { (url, payload) ->
             binding.tvPushUrlResult.text = url

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

@@ -41,7 +41,10 @@ class MindboxFirebaseMessagingService : FirebaseMessagingService() {
         // Method for getting info from Mindbox push
         val mindboxMessage = MindboxFirebase.convertToMindboxRemoteMessage(remoteMessage = message)
         Log.d(Utils.TAG, mindboxMessage.toString())
-
+        // If you want to save the notification you can call your save function from here.
+        mindboxMessage?.let {
+            NotificationStorage.addNotification(it)
+        }
         if (!messageWasHandled) {
             // If the push notification was not from Mindbox or it contains incorrect data, you can write a fallback to process it.
             Log.d(Utils.TAG, "This push not from Mindbox")

example/app/src/main/java/com/mindbox/example/MindboxFirebaseMessagingServiceMyService.kt renamed to example/app/src/main/java/com/mindbox/example/MindboxFirebaseMessagingService.kt

@@ -51,7 +51,10 @@ class MindboxHuaweiMessagingService : HmsMessageService() {
         // Method for getting info from Mindbox push
         val mindboxMessage = MindboxHuawei.convertToMindboxRemoteMessage(remoteMessage = message)
         Log.d(Utils.TAG, mindboxMessage.toString())
-
+        // If you want to save the notification you can call your save function from here.
+        mindboxMessage?.let {
+            NotificationStorage.addNotification(it)
+        }
         if (!messageWasHandled) {
             // If the push notification was not from Mindbox or it contains incorrect data, you can write a fallback to process it.
             Log.d(Utils.TAG, "This push not from Mindbox")

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

@@ -0,0 +1,68 @@
+package com.mindbox.example
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import cloud.mindbox.mobile_sdk.pushes.MindboxRemoteMessage
+import com.bumptech.glide.Glide
+import com.mindbox.example.databinding.ItemNotificationBinding
+
+class NotificationAdapter(private val onItemClick:(MindboxRemoteMessage) -> Unit): RecyclerView.Adapter<NotificationAdapter.NotificationViewHolder>() {
+
+    private val differ = AsyncListDiffer(this, MindboxRemoteMessageItemCallback())
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NotificationViewHolder {
+        return NotificationViewHolder(
+            ItemNotificationBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return differ.currentList.size
+    }
+
+    override fun onBindViewHolder(holder: NotificationViewHolder, position: Int) {
+        holder.bind(differ.currentList[position])
+    }
+
+    fun updateNotifications(newList: List<MindboxRemoteMessage>) {
+        differ.submitList(newList)
+    }
+    inner class NotificationViewHolder(private val binding: ItemNotificationBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: MindboxRemoteMessage) {
+            binding.root.setOnClickListener {
+                onItemClick(item)
+            }
+            binding.tvTitle.text = item.title
+            binding.tvDescription.text = item.description
+            binding.tvPushLink.text = item.pushLink
+            binding.tvUniqueKey.text = item.uniqueKey
+            Glide.with(itemView).load(item.imageUrl).into(binding.ivImage)
+        }
+    }
+
+    class MindboxRemoteMessageItemCallback : DiffUtil.ItemCallback<MindboxRemoteMessage>() {
+        override fun areItemsTheSame(
+            oldItem: MindboxRemoteMessage,
+            newItem: MindboxRemoteMessage
+        ): Boolean {
+            return oldItem.uniqueKey == newItem.uniqueKey
+        }
+
+        override fun areContentsTheSame(
+            oldItem: MindboxRemoteMessage,
+            newItem: MindboxRemoteMessage
+        ): Boolean {
+            return oldItem == newItem
+        }
+    }
+
+}