Merge pull request #413 from mindbox-cloud/release/2.8.1

Release/2.8.1

Author: AndreyEmtsov

gradle.properties

@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # SDK version property
-SDK_VERSION_NAME=2.8.0
+SDK_VERSION_NAME=2.8.1

modulesCommon.gradle

@@ -20,6 +20,13 @@ android {
 
         buildConfigField 'String', 'VERSION_NAME', '"' + SDK_VERSION_NAME + '"'
 
+
+       /* kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }*/
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

sdk/src/main/java/cloud/mindbox/mobile_sdk/Extensions.kt

@@ -4,6 +4,9 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.app.Application
 import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PackageInfoFlags
 import android.content.res.Resources
 import android.os.Build
 import android.os.Process
@@ -164,8 +167,19 @@ internal fun Activity.postDelayedAnimation(action: Runnable) {
     this.root?.postDelayed(action, duration)
 }
 
-internal inline fun <T> Queue<T>.addUnique(item: T, predicate: (T) -> Boolean = { it == item }): Boolean {
+internal inline fun <T> Queue<T>.addUnique(
+    item: T,
+    predicate: (T) -> Boolean = { it == item }
+): Boolean {
     if (any(predicate)) return false
     add(item)
     return true
+}
+
+internal fun PackageManager.getPackageInfoCompat(context: Context, flags: Int): PackageInfo {
+    return if (Build.VERSION_CODES.TIRAMISU <= Build.VERSION.SDK_INT) {
+        getPackageInfo(context.packageName, PackageInfoFlags.of(flags.toLong()))
+    } else {
+        getPackageInfo(context.packageName, flags)
+    }
 }

sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt

@@ -295,6 +295,17 @@ object Mindbox: MindboxLog {
         }
     }
 
+    /**
+     * This method is used to inform when the notification permission status changed to "allowed"
+     * @param context current context is used
+     **/
+    fun updateNotificationPermissionStatus(context: Context) = LoggingExceptionHandler.runCatching {
+            mindboxLogI("updateNotificationPermissionStatus was called")
+            mindboxScope.launch {
+                updateAppInfo(context)
+            }
+    }
+
     /**
      * Creates and deliveries event of "Push delivered". Recommended call this method from
      * background thread.

sdk/src/main/java/cloud/mindbox/mobile_sdk/MindboxConfiguration.kt

@@ -162,7 +162,7 @@ class MindboxConfiguration private constructor(
             try {
                 val packageManager = context.packageManager
                 //noinspection deprecation
-                val packageInfo = packageManager.getPackageInfo(context.packageName, 0)
+                val packageInfo = packageManager.getPackageInfoCompat(context, 0)
                 packageName = packageInfo.packageName.trim()
                 this.versionName = packageInfo.versionName?.trim()
                     ?: PLACEHOLDER_APP_PACKAGE_NAME

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/managers/InAppGlideImageLoaderImpl.kt

@@ -8,6 +8,7 @@ import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.InAppImageLoader
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.InAppImageSizeStorage
 import cloud.mindbox.mobile_sdk.inapp.domain.models.InAppContentFetchingError
 import cloud.mindbox.mobile_sdk.logger.mindboxLogD
+import cloud.mindbox.mobile_sdk.logger.mindboxLogE
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
@@ -38,10 +39,17 @@ internal class InAppGlideImageLoaderImpl(
                         target: Target<Drawable>?,
                         isFirstResource: Boolean
                     ): Boolean {
-                        mindboxLogD("loading image with url = $url for inapp with id $inAppId failed")
-                        cancellableContinuation.resumeWithException(InAppContentFetchingError(e))
-                        return true
-
+                        return runCatching {
+                            mindboxLogD("loading image with url = $url for inapp with id $inAppId failed")
+                            cancellableContinuation.resumeWithException(InAppContentFetchingError(e))
+                            true
+                        }.getOrElse {
+                            mindboxLogE(
+                                "Unknown error when loading image from network failed",
+                                exception = it
+                            )
+                            true
+                        }
                     }
 
                     override fun onResourceReady(
@@ -51,16 +59,23 @@ internal class InAppGlideImageLoaderImpl(
                         dataSource: DataSource?,
                         isFirstResource: Boolean
                     ): Boolean {
-                        mindboxLogD("loading image with url = $url for inapp with id $inAppId succeeded")
-                        inAppImageSizeStorage.addSize(inAppId, url, resource.toBitmap().width, resource.toBitmap().height)
-                        cancellableContinuation.resume(true)
-                        return true
+                        return runCatching {
+                            mindboxLogD("loading image with url = $url for inapp with id $inAppId succeeded")
+                            inAppImageSizeStorage.addSize(inAppId, url, resource.toBitmap().width, resource.toBitmap().height)
+                            cancellableContinuation.resume(true)
+                            true
+                        }.getOrElse {
+                            mindboxLogE(
+                                "Unknown error when loading image from network failed",
+                                exception = it
+                            )
+                            true
+                        }
                     }
                 }).preload()
             requests[inAppId] = target
 
         }
-
     }
 
     override fun cancelLoading(inAppId: String) {

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/view/AbstractInAppViewHolder.kt

@@ -90,13 +90,21 @@ internal abstract class AbstractInAppViewHolder<T : InAppType> :
                     target: Target<Drawable>?,
                     isFirstResource: Boolean
                 ): Boolean {
-                    this.mindboxLogE(
-                        message = "Failed to load inapp image with url = $url",
-                        exception = e
-                            ?: RuntimeException("Failed to load inapp image with url = $url")
-                    )
-                    hide()
-                    return false
+                    return runCatching {
+                        this.mindboxLogE(
+                            message = "Failed to load inapp image with url = $url",
+                            exception = e
+                                ?: RuntimeException("Failed to load inapp image with url = $url")
+                        )
+                        hide()
+                        false
+                    }.getOrElse {
+                        mindboxLogE(
+                            "Unknown error when loading image from cache succeeded",
+                            exception = it
+                        )
+                        false
+                    }
                 }
 
                 override fun onResourceReady(
@@ -106,16 +114,24 @@ internal abstract class AbstractInAppViewHolder<T : InAppType> :
                     dataSource: DataSource?,
                     isFirstResource: Boolean
                 ): Boolean {
-                    bind()
-                    preparedImages[imageView] = true
-                    if (!preparedImages.values.contains(false)) {
-                        mindboxLogI("In-app shown")
-                        wrapper.onInAppShown.onShown()
-                        for (image in preparedImages.keys) {
-                            image.visibility = View.VISIBLE
+                    return runCatching {
+                        bind()
+                        preparedImages[imageView] = true
+                        if (!preparedImages.values.contains(false)) {
+                            mindboxLogI("In-app shown")
+                            wrapper.onInAppShown.onShown()
+                            for (image in preparedImages.keys) {
+                                image.visibility = View.VISIBLE
+                            }
                         }
+                        false
+                    }.getOrElse {
+                        mindboxLogE(
+                            "Unknown error when loading image from cache failed",
+                            exception = it
+                        )
+                        false
                     }
-                    return false
                 }
             })
             .into(imageView)

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/view/SnackbarInAppViewHolder.kt

@@ -4,10 +4,7 @@ import android.view.View
 import android.view.ViewGroup
 import cloud.mindbox.mobile_sdk.SnackbarPosition
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.InAppImageSizeStorage
-import cloud.mindbox.mobile_sdk.inapp.domain.models.Element
-import cloud.mindbox.mobile_sdk.inapp.domain.models.InAppType
-import cloud.mindbox.mobile_sdk.inapp.domain.models.InAppTypeWrapper
-import cloud.mindbox.mobile_sdk.inapp.domain.models.Layer
+import cloud.mindbox.mobile_sdk.inapp.domain.models.*
 import cloud.mindbox.mobile_sdk.inapp.presentation.InAppCallback
 import cloud.mindbox.mobile_sdk.logger.mindboxLogI
 import cloud.mindbox.mobile_sdk.px
@@ -24,6 +21,8 @@ internal class SnackbarInAppViewHolder(
     override val isActive: Boolean
         get() = isInAppMessageActive
 
+    private var requiredSizes: HashMap<String, Size> = HashMap()
+
     override fun show(currentRoot: ViewGroup) {
         super.show(currentRoot)
         mindboxLogI("Try to show inapp with id ${wrapper.inAppType.inAppId}")
@@ -55,11 +54,14 @@ internal class SnackbarInAppViewHolder(
                     currentDialog.addView(inAppImageView)
                     when (wrapper.inAppType.position.margin.kind) {
                         InAppType.Snackbar.Position.Margin.MarginKind.DP -> {
-                            inAppImageView.prepareViewForSnackBar(
-                                inAppImageSizeStorage.getSizeByIdAndUrl(
+                            if (!requiredSizes.containsKey(wrapper.inAppType.inAppId)) {
+                                requiredSizes[wrapper.inAppType.inAppId] = inAppImageSizeStorage.getSizeByIdAndUrl(
                                     wrapper.inAppType.inAppId,
                                     layer.source.url
-                                ),
+                                )
+                            }
+                            inAppImageView.prepareViewForSnackBar(
+                                requiredSizes[wrapper.inAppType.inAppId]!!,
                                 wrapper.inAppType.position.margin.left.px,
                                 wrapper.inAppType.position.margin.right.px
                             )

sdk/src/main/java/cloud/mindbox/mobile_sdk/managers/LifecycleManager.kt

@@ -118,7 +118,7 @@ internal class LifecycleManager(
     }
 
     fun onNewIntent(newIntent: Intent?) = newIntent?.let { intent ->
-        if (intent.data != null || intent.extras?.get(IS_OPENED_FROM_PUSH_BUNDLE_KEY) == true) {
+        if (intent.data != null || intent.extras?.getBoolean(IS_OPENED_FROM_PUSH_BUNDLE_KEY) == true) {
             isIntentChanged = updateHashesList(intent.hashCode())
             sendTrackVisit(intent)
             skipSendingTrackVisit = isAppInBackground

sdk/src/main/java/cloud/mindbox/mobile_sdk/monitoring/data/room/MonitoringDatabase.kt

@@ -7,7 +7,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import cloud.mindbox.mobile_sdk.monitoring.data.room.dao.MonitoringDao
 import cloud.mindbox.mobile_sdk.monitoring.data.room.entities.MonitoringEntity
 
-@Database(entities = [MonitoringEntity::class], version = 2)
+@Database(entities = [MonitoringEntity::class], exportSchema = false, version = 2)
 internal abstract class MonitoringDatabase : RoomDatabase() {
 
     companion object {