2 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index 798ee4b3..858f8590 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -87,6 +87,7 @@ import com.pitchedapps.frost.fragments.BaseFragment
 import com.pitchedapps.frost.fragments.WebFragment
 import com.pitchedapps.frost.services.scheduleNotificationsFromPrefs
 import com.pitchedapps.frost.utils.ACTIVITY_SETTINGS
+import com.pitchedapps.frost.utils.BiometricUtils
 import com.pitchedapps.frost.utils.EXTRA_COOKIES
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.MAIN_TIMEOUT_DURATION
@@ -521,7 +522,9 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         lastAccessTime = System.currentTimeMillis() // precaution to avoid loops
         controlWebview?.resumeTimers()
         launch {
+            val authDefer = BiometricUtils.authenticate(this@BaseMainActivity)
             FbCookie.switchBackUser()
+            authDefer.await()
             if (shouldReload && Prefs.autoRefreshFeed) {
                 refreshAll()
             }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 628ab5dc..3a6af146 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -224,10 +224,11 @@ abstract class WebOverlayActivityBase(private val userAgent: String = USER_AGENT
         with(web) {
             userAgentString = userAgent
             Prefs.prevId = Prefs.userId
-            val authDefer = BiometricUtils.authenticate(this@WebOverlayActivityBase)
             launch {
-                if (userId != Prefs.userId)
+                val authDefer = BiometricUtils.authenticate(this@WebOverlayActivityBase)
+                if (userId != Prefs.userId) {
                     FbCookie.switchUser(userId)
+                }
                 authDefer.await()
                 reloadBase(true)
                 if (Showcase.firstWebOverlay) {