Merge branch 'develop' into feature/ALTAPPS-960/Shared-Send-user-time…

…-zone-to-api-notifications-set-time
hyperskill · Sep 27, 2023 · 98e21a1 · 98e21a1
2 parents 8423402 + 1512307
commit 98e21a1
Show file tree

Hide file tree

Showing 37 changed files with 538 additions and 102 deletions.
diff --git a/.github/workflows/android_beta_deployment.yml b/.github/workflows/android_beta_deployment.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup
@@ -72,7 +72,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/android_release_deployment.yml b/.github/workflows/android_release_deployment.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup
@@ -64,7 +64,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/build_caches.yml b/.github/workflows/build_caches.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/cleanup_pr_caches.yml b/.github/workflows/cleanup_pr_caches.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Cleanup
         run: |

diff --git a/.github/workflows/detect_changed_files_reusable_workflow.yml b/.github/workflows/detect_changed_files_reusable_workflow.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Detect changes
       uses: dorny/[email protected]

diff --git a/.github/workflows/gh_pages_analytics.yml b/.github/workflows/gh_pages_analytics.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Setup CI
         uses: ./.github/actions/setup-android

diff --git a/.github/workflows/gradle_wrapper_validation.yml b/.github/workflows/gradle_wrapper_validation.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
diff --git a/.github/workflows/ios_beta_deployment.yml b/.github/workflows/ios_beta_deployment.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/ios_release_deployment.yml b/.github/workflows/ios_release_deployment.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
 
       - name: Setup Ruby
         uses: ruby/[email protected]

diff --git a/.github/workflows/merge_main_into_develop.yml b/.github/workflows/merge_main_into_develop.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT }}

diff --git a/.github/workflows/unit_testing.yml b/.github/workflows/unit_testing.yml
@@ -45,7 +45,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup
@@ -69,7 +69,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup
@@ -93,7 +93,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     - name: Setup CI
       id: setup

diff --git a/...java/org/hyperskill/app/android/notification/permission/NotificationPermissionDelegate.kt b/...java/org/hyperskill/app/android/notification/permission/NotificationPermissionDelegate.kt
@@ -5,25 +5,48 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 
 class NotificationPermissionDelegate(
-    private val fragment: Fragment
+    private val fragment: Fragment,
+    private val onResult: ((Result) -> Unit)
 ) {
-    private var onResult: ((Result) -> Unit)? = null
+
+    companion object {
+        private const val SAVED_STATE_PROVIDER_KEY = "NOTIFICATION_PERMISSION_DELEGATE"
+        private const val SHOULD_SHOW_REQUEST_PERMISSION_RATIONALE_BEFORE =
+            "SHOULD_SHOW_REQUEST_PERMISSION_RATIONALE_BEFORE"
+    }
+
+    private var shouldShowRequestPermissionRationaleBefore: Boolean = false
+
+    init {
+        this.shouldShowRequestPermissionRationaleBefore =
+            fragment.savedStateRegistry.consumeRestoredStateForKey(SAVED_STATE_PROVIDER_KEY)
+                ?.getBoolean(SHOULD_SHOW_REQUEST_PERMISSION_RATIONALE_BEFORE, false)
+                ?: false
+        fragment.savedStateRegistry.registerSavedStateProvider(SAVED_STATE_PROVIDER_KEY) {
+            bundleOf(SHOULD_SHOW_REQUEST_PERMISSION_RATIONALE_BEFORE to shouldShowRequestPermissionRationaleBefore)
+        }
+    }
 
     private val notificationPermissionCallback = fragment.registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) { isNotificationPermissionGranted ->
         val result = when {
             isNotificationPermissionGranted -> Result.GRANTED
+            // User denied permission another time
+            // System request was shown for the last time
+            shouldShowRequestPermissionRationaleBefore &&
+                !fragment.shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS) -> Result.DENIED
             !fragment.shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS) -> Result.DONT_ASK
             else -> Result.DENIED
         }
-        onResult?.invoke(result)
+        onResult.invoke(result)
     }
 
-    fun requestNotificationPermission(onResult: (Result) -> Unit) {
+    fun requestNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             val notificationPermissionGranted =
                 ContextCompat.checkSelfPermission(
@@ -33,7 +56,8 @@ class NotificationPermissionDelegate(
             if (notificationPermissionGranted) {
                 onResult(Result.GRANTED)
             } else {
-                this.onResult = onResult
+                shouldShowRequestPermissionRationaleBefore =
+                    fragment.shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)
                 notificationPermissionCallback.launch(Manifest.permission.POST_NOTIFICATIONS)
             }
         } else {