AND-17253 Fingerprint dialog is sometimes bypassed when opening a link

suwasto · Sep 5, 2023 · e0c961d · e0c961d
1 parent 6a08b40
commit e0c961d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/app/src/main/java/mega/privacy/android/app/presentation/openlink/OpenLinkActivity.kt b/app/src/main/java/mega/privacy/android/app/presentation/openlink/OpenLinkActivity.kt
@@ -214,21 +214,18 @@ class OpenLinkActivity : PasscodeActivity(), MegaRequestListenerInterface,
             }
             // Folder Download link
             matchRegexs(url, FOLDER_LINK_REGEXS) -> {
-                lifecycleScope.launch {
-                    val intent =
-                        Intent(this@OpenLinkActivity, FolderLinkComposeActivity::class.java)
-                    startActivity(
-                        intent
-                            .putExtra(
-                                OPENED_FROM_CHAT,
-                                intent.getBooleanExtra(OPENED_FROM_CHAT, false)
-                            )
-                            .setFlags(FLAG_ACTIVITY_CLEAR_TOP)
-                            .setAction(ACTION_OPEN_MEGA_FOLDER_LINK)
-                            .setData(Uri.parse(url))
-                    )
-                    finish()
-                }
+                val intent = Intent(this@OpenLinkActivity, FolderLinkComposeActivity::class.java)
+                startActivity(
+                    intent
+                        .putExtra(
+                            OPENED_FROM_CHAT,
+                            intent.getBooleanExtra(OPENED_FROM_CHAT, false)
+                        )
+                        .setFlags(FLAG_ACTIVITY_CLEAR_TOP)
+                        .setAction(ACTION_OPEN_MEGA_FOLDER_LINK)
+                        .setData(Uri.parse(url))
+                )
+                finish()
             }
             // Chat link or Meeting link
             matchRegexs(url, CHAT_LINK_REGEXS) -> {

diff --git a/app/src/main/java/mega/privacy/android/app/utils/PasscodeUtil.kt b/app/src/main/java/mega/privacy/android/app/utils/PasscodeUtil.kt
@@ -10,6 +10,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.qualifiers.ActivityContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import mega.privacy.android.app.R
 import mega.privacy.android.app.activities.settingsActivities.PasscodeLockActivity
 import mega.privacy.android.app.objects.PasscodeManagement
@@ -320,7 +321,7 @@ class PasscodeUtil @Inject constructor(
      * Called after resume some activity to check if should lock or not the app.
      */
     fun resume() {
-        scope.launch {
+        runBlocking {
             if (shouldLock()) {
                 showLockScreen()
             }