Merge pull request #446 from mindbox-cloud/release/2.9.0-rc

Release/2.9.0-rc

Author: AndreyEmtsov

.github/workflows/publish.yml

@@ -98,17 +98,17 @@ jobs:
         run: ./gradlew --no-daemon publish -PsonatypeUsername=${{secrets.OSSRHUSERNAME}} -PsonatypePassword=${{secrets.OSSRHPASSWORD}}
 
         #To update version in Github README.md
-      - name: Version Upgrade
-        run: |
-          chmod +x ./maven-version-update.sh
-          ./maven-version-update.sh
-      - name: Commit and push if it changed
-        run: |
-          git diff
-          git config --global user.email "[email protected]"
-          git config --global user.name "GitHub Actions"
-          git commit -am "Update README.md" || exit 0
-          git push origin HEAD:develop
+  #    - name: Version Upgrade
+  #      run: |
+   #       chmod +x ./maven-version-update.sh
+    #      ./maven-version-update.sh
+     # - name: Commit and push if it changed
+      #  run: |
+       #   git diff
+        #  git config --global user.email "[email protected]"
+         # git config --global user.name "GitHub Actions"
+          #git commit -am "Update README.md" || exit 0
+          #git push origin HEAD:develop
 
       - name: Job status notification
         uses: rtCamp/action-slack-notify@v2

README.md

@@ -21,7 +21,7 @@ To integrate Mindbox SDK into your Android app, follow the installation process
 2. Now, add the Mindbox SDK to your app-level build.gradle file:
 ```markdown
     dependencies {
-        implementation 'cloud.mindbox:mobile-sdk:2.8.3'
+        implementation 'cloud.mindbox:mobile-sdk:{use-latest-version}}'
     }
 ```
 

example/app/build.gradle

@@ -58,9 +58,9 @@ dependencies {
     implementation 'com.huawei.hms:push:6.11.0.300'
 
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.8.4'
-    implementation 'cloud.mindbox:mindbox-firebase:2.8.4'
-    implementation 'cloud.mindbox:mindbox-huawei:2.8.4'
+    implementation 'cloud.mindbox:mobile-sdk:2.8.5'
+    implementation 'cloud.mindbox:mindbox-firebase:2.8.5'
+    implementation 'cloud.mindbox:mindbox-huawei:2.8.5'
 
     //Glade for custom loader
     implementation 'com.github.bumptech.glide:glide:4.15.1'

gradle.properties

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

sdk/src/main/AndroidManifest.xml

@@ -8,4 +8,15 @@
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <uses-sdk tools:overrideLibrary="io.mockk, io.mockk.proxy.android" />
+    <application>
+        <activity
+            android:name="cloud.mindbox.mobile_sdk.inapp.presentation.actions.PushActivationActivity"
+            android:excludeFromRecents="true"
+            android:exported="false"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleTask"
+            android:noHistory="true"
+            android:theme="@style/Theme.MindboxTransparent">
+        </activity>
+    </application>
 </manifest>

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

@@ -30,6 +30,7 @@ import cloud.mindbox.mobile_sdk.services.BackgroundWorkManager
 import cloud.mindbox.mobile_sdk.utils.Constants
 import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
 import cloud.mindbox.mobile_sdk.utils.MigrationManager
+import cloud.mindbox.mobile_sdk.utils.loggingRunCatching
 import com.jakewharton.threetenabp.AndroidThreeTen
 import kotlinx.coroutines.*
 import kotlinx.coroutines.Dispatchers.Default
@@ -86,6 +87,8 @@ object Mindbox : MindboxLog {
 
     private lateinit var lifecycleManager: LifecycleManager
 
+    private val userVisitManager: UserVisitManager by mindboxInject { userVisitManager }
+
     internal var pushServiceHandler: PushServiceHandler? = null
 
     private val inAppMessageManager: InAppMessageManager by mindboxInject { inAppMessageManager }
@@ -307,23 +310,23 @@ object Mindbox : MindboxLog {
      * @param pushService - the instance of [MindboxPushService], which handles push notifications.
      */
     fun updatePushToken(context: Context, token: String, pushService: MindboxPushService) =
-        MindboxLoggerImpl.runCatching {
+        loggingRunCatching {
             initComponents(context)
             mindboxLogI("updatePushToken token: $token with provider $pushService")
 
             if (token.trim().isEmpty()) {
                 mindboxLogW("Token is empty! Skipping update token.")
-                return@runCatching
+                return@loggingRunCatching
             }
 
             if (MindboxPreferences.isFirstInitialize) {
                 mindboxLogW("Mindbox init was never called. Skipping update token.")
-                return@runCatching
+                return@loggingRunCatching
             }
 
             if (pushService.tag != pushServiceHandler?.notificationProvider) {
                 mindboxLogW("Token provider ${pushService.tag} not matching with selected provider ${pushServiceHandler?.notificationProvider}. Skipping update token.")
-                return@runCatching
+                return@loggingRunCatching
             }
 
             mindboxScope.launch {
@@ -482,6 +485,9 @@ object Mindbox : MindboxLog {
 
             if (!firstInitCall) {
                 InitializeLock.reset(InitializeLock.State.SAVE_MINDBOX_CONFIG)
+            } else
+            {
+               userVisitManager.saveUserVisit()
             }
 
             initScope.launch {

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

@@ -12,14 +12,21 @@ import cloud.mindbox.mobile_sdk.inapp.data.validators.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.InAppContentFetcher
 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.interfaces.PermissionManager
 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
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.repositories.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.validators.InAppValidator
+import cloud.mindbox.mobile_sdk.inapp.presentation.MindboxNotificationManager
+import cloud.mindbox.mobile_sdk.inapp.presentation.MindboxNotificationManagerImpl
+import cloud.mindbox.mobile_sdk.managers.RequestPermissionManager
+import cloud.mindbox.mobile_sdk.managers.RequestPermissionManagerImpl
 import cloud.mindbox.mobile_sdk.models.TreeTargetingDto
 import cloud.mindbox.mobile_sdk.monitoring.data.validators.MonitoringValidator
 import cloud.mindbox.mobile_sdk.utils.Constants
+import cloud.mindbox.mobile_sdk.utils.PushPermissionActionDto
+import cloud.mindbox.mobile_sdk.utils.RedirectUrlActionDto
 import cloud.mindbox.mobile_sdk.utils.RuntimeTypeAdapterFactory
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -116,6 +123,9 @@ internal fun DataModule(
 
     override val sessionStorageManager: SessionStorageManager by lazy { SessionStorageManager() }
 
+    override val permissionManager: PermissionManager
+        get() = PermissionManagerImpl(appContext)
+
     override val inAppContentFetcher: InAppContentFetcher by lazy {
         InAppContentFetcherImpl(
             inAppImageLoader
@@ -203,6 +213,16 @@ internal fun DataModule(
 
     override val inAppMapper: InAppMapper by lazy { InAppMapper() }
 
+    override val mindboxNotificationManager: MindboxNotificationManager by lazy {
+        MindboxNotificationManagerImpl(
+            context = appContext,
+            requestPermissionManager = requestPermissionManager
+        )
+    }
+
+    override val requestPermissionManager: RequestPermissionManager
+        get() = RequestPermissionManagerImpl()
+
     override val gson: Gson by lazy {
         GsonBuilder().registerTypeAdapterFactory(
             RuntimeTypeAdapterFactory.of(
@@ -240,8 +260,11 @@ internal fun DataModule(
                     Constants.TYPE_JSON_NAME,
                     true
                 ).registerSubtype(
-                    BackgroundDto.LayerDto.ImageLayerDto.ActionDto.RedirectUrlActionDto::class.java,
-                    BackgroundDto.LayerDto.ImageLayerDto.ActionDto.RedirectUrlActionDto.REDIRECT_URL_ACTION_TYPE_JSON_NAME
+                    RedirectUrlActionDto::class.java,
+                    RedirectUrlActionDto.REDIRECT_URL_ACTION_TYPE_JSON_NAME
+                ).registerSubtype(
+                    PushPermissionActionDto::class.java,
+                    PushPermissionActionDto.PUSH_PERMISSION_TYPE_JSON_NAME
                 )
             ).registerTypeAdapterFactory(
                 RuntimeTypeAdapterFactory.of(
@@ -304,6 +327,12 @@ internal fun DataModule(
                 ).registerSubtype(
                     TreeTargetingDto.ViewProductNodeDto::class.java,
                     TreeTargetingDto.ViewProductNodeDto.VIEW_PRODUCT_ID_JSON_NAME
+                ).registerSubtype(
+                    TreeTargetingDto.VisitNodeDto::class.java,
+                    TreeTargetingDto.VisitNodeDto.VISIT_JSON_NAME
+                ).registerSubtype(
+                    TreeTargetingDto.PushPermissionDto::class.java,
+                    TreeTargetingDto.PushPermissionDto.PUSH_PERMISSION_JSON_NAME
                 )
             ).create()
     }

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

@@ -4,16 +4,14 @@ package cloud.mindbox.mobile_sdk.di.modules
 import cloud.mindbox.mobile_sdk.abtests.CustomerAbMixer
 import cloud.mindbox.mobile_sdk.abtests.CustomerAbMixerImpl
 import cloud.mindbox.mobile_sdk.abtests.InAppABTestLogic
-import cloud.mindbox.mobile_sdk.inapp.domain.CallbackInteractorImpl
-import cloud.mindbox.mobile_sdk.inapp.domain.InAppProcessingManagerImpl
-import cloud.mindbox.mobile_sdk.inapp.domain.InAppEventManagerImpl
-import cloud.mindbox.mobile_sdk.inapp.domain.InAppFilteringManagerImpl
-import cloud.mindbox.mobile_sdk.inapp.domain.InAppInteractorImpl
+import cloud.mindbox.mobile_sdk.inapp.domain.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.interactors.CallbackInteractor
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.interactors.InAppInteractor
-import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.InAppProcessingManager
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.InAppEventManager
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.InAppFilteringManager
+import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.InAppProcessingManager
+import cloud.mindbox.mobile_sdk.managers.UserVisitManager
+import cloud.mindbox.mobile_sdk.managers.UserVisitManagerImpl
 
 
 internal fun DomainModule(
@@ -51,14 +49,19 @@ internal fun DomainModule(
         get() = InAppEventManagerImpl()
 
     override val inAppFilteringManager: InAppFilteringManager
-        get() = InAppFilteringManagerImpl(inAppRepository = inAppRepository)
+        get() = InAppFilteringManagerImpl(
+            inAppRepository = inAppRepository
+        )
 
     override val inAppABTestLogic: InAppABTestLogic
         get() = InAppABTestLogic(
             mixer = customerAbMixer,
             repository = mobileConfigRepository
         )
 
+    override val userVisitManager: UserVisitManager
+        get() = UserVisitManagerImpl()
+
     override val customerAbMixer: CustomerAbMixer
          get() = CustomerAbMixerImpl()
 }

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

@@ -11,16 +11,16 @@ import cloud.mindbox.mobile_sdk.inapp.data.validators.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.InAppContentFetcher
 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.interfaces.PermissionManager
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.interactors.CallbackInteractor
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.interactors.InAppInteractor
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.managers.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.repositories.*
 import cloud.mindbox.mobile_sdk.inapp.domain.interfaces.validators.InAppValidator
-import cloud.mindbox.mobile_sdk.inapp.presentation.ActivityManager
-import cloud.mindbox.mobile_sdk.inapp.presentation.ClipboardManager
-import cloud.mindbox.mobile_sdk.inapp.presentation.InAppMessageManager
-import cloud.mindbox.mobile_sdk.inapp.presentation.InAppMessageViewDisplayer
+import cloud.mindbox.mobile_sdk.inapp.presentation.*
 import cloud.mindbox.mobile_sdk.managers.GatewayManager
+import cloud.mindbox.mobile_sdk.managers.RequestPermissionManager
+import cloud.mindbox.mobile_sdk.managers.UserVisitManager
 import cloud.mindbox.mobile_sdk.monitoring.data.mappers.MonitoringMapper
 import cloud.mindbox.mobile_sdk.monitoring.data.room.MonitoringDatabase
 import cloud.mindbox.mobile_sdk.monitoring.data.room.dao.MonitoringDao
@@ -97,6 +97,9 @@ internal interface DataModule : MindboxModule {
     val snackbarElementValidator: SnackBarElementValidator
     val snackBarElementDtoDataFiller: SnackbarElementDtoDataFiller
     val closeButtonSnackbarElementDtoDataFiller: CloseButtonSnackbarElementDtoDataFiller
+    val mindboxNotificationManager: MindboxNotificationManager
+    val permissionManager: PermissionManager
+    val requestPermissionManager: RequestPermissionManager
 }
 
 internal interface MonitoringModule : MindboxModule {
@@ -118,6 +121,7 @@ internal interface DomainModule : MindboxModule {
     val inAppFilteringManager: InAppFilteringManager
     val customerAbMixer: CustomerAbMixer
     val inAppABTestLogic: InAppABTestLogic
+    val userVisitManager: UserVisitManager
 }
 
 internal interface ApiModule : MindboxModule {

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/dto/BackgroundDto.kt

@@ -33,6 +33,17 @@ internal data class BackgroundDto(
                         const val REDIRECT_URL_ACTION_TYPE_JSON_NAME = "redirectUrl"
                     }
                 }
+
+                internal data class PushPermissionActionDto(
+                    @SerializedName("intentPayload")
+                    val intentPayload: String?,
+                    @SerializedName("${"$"}type")
+                    val type: String?,
+                ) : ActionDto() {
+                    internal companion object {
+                        const val PUSH_PERMISSION_TYPE_JSON_NAME = "pushPermission"
+                    }
+                }
             }
 
             internal sealed class SourceDto {