Merge pull request #460 from mindbox-cloud/release/2.9.1

Release/2.9.1

Author: AndreyEmtsov

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.5'
-    implementation 'cloud.mindbox:mindbox-firebase:2.8.5'
-    implementation 'cloud.mindbox:mindbox-huawei:2.8.5'
+    implementation 'cloud.mindbox:mobile-sdk:2.9.1'
+    implementation 'cloud.mindbox:mindbox-firebase:2.9.1'
+    implementation 'cloud.mindbox:mindbox-huawei:2.9.1'
 
     //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.9.0
+SDK_VERSION_NAME=2.9.1

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/PushActivationActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.os.SystemClock
 import android.view.MotionEvent
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
@@ -16,9 +17,12 @@ internal class PushActivationActivity : Activity() {
 
     private val mindboxNotificationManager by mindboxInject { mindboxNotificationManager }
     private val requestPermissionManager by mindboxInject { requestPermissionManager }
+    private var shouldCheckDialogShowing = false
+    private val resumeTimes = mutableListOf<Long>()
 
     companion object {
         private const val PERMISSION_REQUEST_CODE = 125129
+        private const val TIME_BETWEEN_RESUME = 350
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
@@ -39,27 +43,30 @@ internal class PushActivationActivity : Activity() {
             granted -> {
                 mindboxLogI("User clicked 'allow' in request permission")
                 Mindbox.updateNotificationPermissionStatus(this)
+                finish()
             }
 
             permissionDenied && !shouldShowRationale -> {
                 if (mindboxNotificationManager.shouldOpenSettings) {
                     if (requestPermissionManager.getRequestCount() > 1) {
                         mindboxLogI("User already rejected permission two times, try open settings")
                         mindboxNotificationManager.openNotificationSettings(this)
+                        finish()
                     } else {
-                        requestPermissionManager.decreaseRequestCounter()
-                        mindboxLogI("User dismissed request")
+                        mindboxLogI("Awaiting show dialog")
+                        shouldCheckDialogShowing = true
                     }
                 } else {
                     mindboxNotificationManager.shouldOpenSettings = true
+                    finish()
                 }
             }
 
             permissionDenied && shouldShowRationale -> {
                 mindboxLogI("User rejected first permission request")
+                finish()
             }
         }
-        finish()
     }
 
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
@@ -74,6 +81,23 @@ internal class PushActivationActivity : Activity() {
         requestPermissions(arrayOf(Constants.POST_NOTIFICATION), PERMISSION_REQUEST_CODE)
     }
 
+    override fun onResume() {
+        resumeTimes.add(SystemClock.elapsedRealtime())
+        if (shouldCheckDialogShowing) {
+            if ((resumeTimes.last() - resumeTimes.first()) < TIME_BETWEEN_RESUME) {
+                resumeTimes.clear()
+                mindboxLogI("System dialog not shown -> open settings")
+                mindboxNotificationManager.openNotificationSettings(this)
+            } else {
+                mindboxLogI("User dismiss permission request ")
+                requestPermissionManager.decreaseRequestCounter()
+            }
+            shouldCheckDialogShowing = false
+            finish()
+        }
+        super.onResume()
+    }
+
     override fun onTouchEvent(event: MotionEvent): Boolean {
         if (event.action == MotionEvent.ACTION_DOWN) {
             finish()