Merge pull request #363 from mindbox-cloud/release-2.7.0-rc

Release 2.7.0 rc

Author: sergeysozinov

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -30,7 +30,7 @@ jobs:
   unit:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
   build:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -31,7 +31,7 @@ jobs:
   unit:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -50,7 +50,7 @@ jobs:
     needs: [unit, lint]
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3

gradle.properties

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

proguard/proguard-gson.pro

@@ -1,20 +1,48 @@
-# Gson
+# Keep generic signatures; needed for correct type resolution
 -keepattributes Signature
 
-# For using GSON @Expose annotation
+# Keep Gson annotations
+# Note: Cannot perform finer selection here to only cover Gson annotations, see also https://stackoverflow.com/q/47515093
 -keepattributes *Annotation*
 
-# Gson specific classes
--dontwarn sun.misc.**
 
-# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
+### The following rules are needed for R8 in "full mode" which only adheres to `-keepattribtues` if
+### the corresponding class or field is matches by a `-keep` rule as well, see
+### https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md#r8-full-mode
 
-# Prevent R8 from leaving Data object members always null
+# Keep class TypeToken (respectively its generic signature)
+-keep class com.google.gson.reflect.TypeToken { *; }
+
+# Keep any (anonymous) classes extending TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+
+# Keep classes with @JsonAdapter annotation
+-keep @com.google.gson.annotations.JsonAdapter class *
+
+# Keep fields with @SerializedName annotation, but allow obfuscation of their names
 -keepclassmembers,allowobfuscation class * {
   @com.google.gson.annotations.SerializedName <fields>;
-}
+}
+
+# Keep fields with any other Gson annotation
+-keepclassmembers class * {
+  @com.google.gson.annotations.Expose <fields>;
+  @com.google.gson.annotations.JsonAdapter <fields>;
+  @com.google.gson.annotations.Since <fields>;
+  @com.google.gson.annotations.Until <fields>;
+}
+
+# Keep no-args constructor of classes which can be used with @JsonAdapter
+# By default their no-args constructor is invoked to create an adapter instance
+-keep class * extends com.google.gson.TypeAdapter {
+  <init>();
+}
+-keep class * implements com.google.gson.TypeAdapterFactory {
+  <init>();
+}
+-keep class * implements com.google.gson.JsonSerializer {
+  <init>();
+}
+-keep class * implements com.google.gson.JsonDeserializer {
+  <init>();
+}

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

@@ -1,5 +1,11 @@
 package cloud.mindbox.mobile_sdk
 
+import android.app.ActivityManager
+import android.app.Application
+import android.content.Context
+import android.os.Build
+import android.os.Process
+import android.view.View
 import cloud.mindbox.mobile_sdk.logger.MindboxLoggerImpl
 import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
 import java.time.Instant
@@ -8,6 +14,7 @@ import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
+
 internal fun Map<String, String>.toUrlQueryString() = LoggingExceptionHandler.runCatching(
     defaultValue = ""
 ) {
@@ -60,7 +67,36 @@ internal inline fun <reified T : Enum<T>> String?.enumValue(default: T? = null):
                 .replace("_", "")
                 .equals(
                     this.replace("_", "").trim(),
-                    ignoreCase = true)
+                    ignoreCase = true
+                )
         }
     } ?: default ?: throw IllegalArgumentException("Value for $this could not be found")
+}
+
+internal fun Context.isMainProcess(processName: String?): Boolean {
+    val mainProcessName = getString(R.string.mindbox_android_process).ifBlank { packageName }
+    return processName?.equalsAny(
+        mainProcessName,
+        "$packageName:$mainProcessName",
+        "$packageName$mainProcessName",
+    ) ?: false
+}
+
+internal fun Context.getCurrentProcessName(): String? {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        return Application.getProcessName()
+    }
+
+    val mypid = Process.myPid()
+    val manager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+    val processes = manager.runningAppProcesses
+
+    return processes.firstOrNull { info -> info.pid == mypid }?.processName
+}
+
+internal fun View.setSingleClickListener(listener: View.OnClickListener) {
+    setOnClickListener {
+        setOnClickListener(null)
+        listener.onClick(it)
+    }
 }

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

@@ -14,6 +14,8 @@ import cloud.mindbox.mobile_sdk.inapp.presentation.InAppCallback
 import cloud.mindbox.mobile_sdk.inapp.presentation.InAppMessageManager
 import cloud.mindbox.mobile_sdk.logger.Level
 import cloud.mindbox.mobile_sdk.logger.MindboxLoggerImpl
+import cloud.mindbox.mobile_sdk.logger.mindboxLogD
+import cloud.mindbox.mobile_sdk.logger.mindboxLogW
 import cloud.mindbox.mobile_sdk.managers.*
 import cloud.mindbox.mobile_sdk.models.*
 import cloud.mindbox.mobile_sdk.models.operation.OperationBody
@@ -26,6 +28,7 @@ import cloud.mindbox.mobile_sdk.pushes.handler.image.MindboxImageFailureHandler
 import cloud.mindbox.mobile_sdk.pushes.handler.image.MindboxImageLoader
 import cloud.mindbox.mobile_sdk.repository.MindboxPreferences
 import cloud.mindbox.mobile_sdk.services.BackgroundWorkManager
+import cloud.mindbox.mobile_sdk.utils.Constants
 import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
 import kotlinx.coroutines.*
 import kotlinx.coroutines.Dispatchers.Default
@@ -382,8 +385,15 @@ object Mindbox {
         pushServices: List<MindboxPushService>,
     ) {
         LoggingExceptionHandler.runCatching {
+
+            val currentProcessName = context.getCurrentProcessName()
+            if (!context.isMainProcess(currentProcessName)) {
+                this@Mindbox.mindboxLogW("Skip Mindbox init not in main process! Current process $currentProcessName")
+                return@runCatching
+            }
+
             initComponents(context.applicationContext, pushServices)
-            MindboxLoggerImpl.d(this, "init. firstInitCall: $firstInitCall, " +
+            this@Mindbox.mindboxLogD("init in $currentProcessName. firstInitCall: $firstInitCall, " +
                     "configuration: $configuration, pushServices: " +
                     pushServices.joinToString(", ") { it.javaClass.simpleName } + ", SdkVersion:${getSdkVersion()}")
             initScope.launch {
@@ -1090,6 +1100,7 @@ object Mindbox {
                 endpointId = endpointId,
                 source = source,
                 requestUrl = requestUrl,
+                sdkVersionNumeric = Constants.SDK_VERSION_NUMERIC
             )
 
             MindboxEventManager.appStarted(applicationContext, trackVisitData)

sdk/src/main/java/cloud/mindbox/mobile_sdk/abtests/CustomerAbMixer.kt

@@ -0,0 +1,5 @@
+package cloud.mindbox.mobile_sdk.abtests
+
+interface CustomerAbMixer {
+    fun stringModulusHash(identifier: String, salt: String): Int
+}

sdk/src/main/java/cloud/mindbox/mobile_sdk/abtests/CustomerAbMixerImpl.kt

@@ -0,0 +1,26 @@
+package cloud.mindbox.mobile_sdk.abtests
+
+import java.security.MessageDigest
+
+internal class CustomerAbMixerImpl: CustomerAbMixer {
+
+    private val sha256 by lazy {
+        MessageDigest.getInstance("SHA-256").apply { reset() }
+    }
+
+    @OptIn(ExperimentalUnsignedTypes::class)
+    override fun stringModulusHash(identifier: String, salt: String): Int {
+        val saltedId = identifier.uppercase() + salt.uppercase()
+
+        val bytes = saltedId.toByteArray(Charsets.UTF_8)
+        val hash = sha256.digest(bytes).toUByteArray()
+
+        val bigEndianLastBytesAsInt: Int =
+            (hash[28] shl 24) or (hash[29] shl 16) or (hash[30] shl 8) or hash[31].toInt()
+        val unsigned = bigEndianLastBytesAsInt.toUInt()
+
+        return (unsigned % 100u).toInt()
+    }
+
+    private infix fun UByte.shl(that: Int): Int = this.toInt().shl(that)
+}

sdk/src/main/java/cloud/mindbox/mobile_sdk/abtests/InAppABTestLogic.kt

@@ -0,0 +1,70 @@
+package cloud.mindbox.mobile_sdk.abtests
+
+import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.repositories.MobileConfigRepository
+import cloud.mindbox.mobile_sdk.inapp.domain.models.ABTest
+import cloud.mindbox.mobile_sdk.logger.MindboxLog
+import cloud.mindbox.mobile_sdk.repository.MindboxPreferences
+
+internal class InAppABTestLogic(
+    private val mixer: CustomerAbMixer,
+    private val repository: MobileConfigRepository,
+): MindboxLog {
+
+    suspend fun getInAppsPool(allInApps: List<String>): Set<String> {
+        val abtests = repository.getABTests()
+        val uuid = MindboxPreferences.deviceUuid
+
+        if (abtests.isEmpty()) {
+            logI("Abtests is empty. Use all inApps.")
+            return allInApps.toSet()
+        }
+        if (allInApps.isEmpty()) {
+            return emptySet()
+        }
+
+        val inAppsForAbtest: List<Set<String>> = abtests.map { abtest ->
+
+            val hash = mixer.stringModulusHash(
+                identifier = uuid,
+                salt = abtest.salt.uppercase(),
+            )
+
+            logI("Mixer calculate hash $hash for abtest ${abtest.id} with salt ${abtest.salt} and deviceUuid $uuid")
+
+            val targetVariantInApps: MutableSet<String> = mutableSetOf()
+            val otherVariantInApps: MutableSet<String> = mutableSetOf()
+
+            abtest.variants.onEach { variant ->
+                val inApps: List<String> = when (variant.kind) {
+                    ABTest.Variant.VariantKind.ALL -> allInApps
+                    ABTest.Variant.VariantKind.CONCRETE -> variant.inapps
+                }
+                if ((variant.lower until variant.upper).contains(hash)) {
+                    targetVariantInApps.addAll(inApps)
+                    logI("Selected variant $variant for ${abtest.id}")
+                } else {
+                    otherVariantInApps.addAll(inApps)
+                }
+            }
+
+            (targetVariantInApps + (allInApps - otherVariantInApps)).also { inappsSet ->
+                logI("For abtest ${abtest.id} determined $inappsSet")
+            }
+        }
+
+        if (inAppsForAbtest.isEmpty()) {
+            logW("No inApps after calculation abtests logic. InApp will not be shown.")
+            return setOf()
+        }
+
+        return if (inAppsForAbtest.size == 1) {
+            inAppsForAbtest.first()
+        } else {
+            getIntersectionForAllABTests(inAppsForAbtest)
+        }
+    }
+
+    private fun getIntersectionForAllABTests(inAppsForAbtest: List<Set<String>>): Set<String> =
+        inAppsForAbtest.reduce { acc, list -> acc.intersect(list) }
+
+}

sdk/src/main/java/cloud/mindbox/mobile_sdk/di/modules/DataModule.kt

@@ -9,9 +9,7 @@ import cloud.mindbox.mobile_sdk.inapp.data.repositories.InAppGeoRepositoryImpl
 import cloud.mindbox.mobile_sdk.inapp.data.repositories.InAppRepositoryImpl
 import cloud.mindbox.mobile_sdk.inapp.data.repositories.InAppSegmentationRepositoryImpl
 import cloud.mindbox.mobile_sdk.inapp.data.repositories.MobileConfigRepositoryImpl
-import cloud.mindbox.mobile_sdk.inapp.data.validators.InAppValidatorImpl
-import cloud.mindbox.mobile_sdk.inapp.data.validators.OperationNameValidator
-import cloud.mindbox.mobile_sdk.inapp.data.validators.OperationValidator
+import cloud.mindbox.mobile_sdk.inapp.data.validators.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.GeoSerializationManager
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.InAppSerializationManager
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.MobileConfigSerializationManager
@@ -42,6 +40,7 @@ internal fun DataModule(
             inAppMapper = inAppMapper,
             mobileConfigSerializationManager = mobileConfigSerializationManager,
             inAppValidator = inAppValidator,
+            abTestValidator = abTestValidator,
             monitoringValidator = monitoringValidator,
             operationNameValidator = operationNameValidator,
             operationValidator = operationValidator,
@@ -86,7 +85,11 @@ internal fun DataModule(
 
     override val monitoringValidator: MonitoringValidator by lazy { MonitoringValidator() }
 
-    override val inAppValidator: InAppValidator by lazy { InAppValidatorImpl() }
+    override val inAppValidator: InAppValidator by lazy { InAppValidatorImpl(sdkVersionValidator) }
+
+    override val abTestValidator: ABTestValidator by lazy { ABTestValidator(sdkVersionValidator) }
+
+    override val sdkVersionValidator: SdkVersionValidator by lazy { SdkVersionValidator() }
 
     override val operationNameValidator: OperationNameValidator
         get() = OperationNameValidator()