feat: Lock the app when the screen turns off (#2118)

Infomaniak · Dec 26, 2024 · 357c958 · 357c958
2 parents 51d5bd8 + dfb8149
commit 357c958
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 30 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -132,6 +132,7 @@
         <activity
             android:name="com.infomaniak.lib.applock.LockActivity"
             android:exported="false"
+            android:launchMode="singleTop"
             android:theme="@style/AppThemeLock" />
 
         <activity

diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
@@ -69,7 +69,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matomo.sdk.Tracker
-import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
 
@@ -79,8 +78,6 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
     val matomoTracker: Tracker by lazy { buildTracker(shouldOptOut = !localSettings.isMatomoTrackingEnabled) }
     var isAppInBackground = true
         private set
-    var lastAppClosingTime: Long? = FIRST_LAUNCH_TIME
-        private set
 
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
@@ -145,7 +142,6 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
     }
 
     override fun onStop(owner: LifecycleOwner) {
-        lastAppClosingTime = Date().time
         isAppInBackground = true
         owner.lifecycleScope.launch {
             syncMailboxesWorkerScheduler.scheduleWorkIfNeeded()
@@ -289,10 +285,6 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
 
     override fun newImageLoader(): ImageLoader = CoilUtils.newImageLoader(applicationContext, tokenInterceptorListener())
 
-    fun resetLastAppClosing() {
-        lastAppClosingTime = null
-    }
-
     fun createSvgImageLoader(): ImageLoader {
         return CoilUtils.newImageLoader(
             applicationContext,

diff --git a/app/src/main/java/com/infomaniak/mail/ui/BaseActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/BaseActivity.kt
@@ -21,11 +21,9 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import com.infomaniak.lib.applock.LockActivity
-import com.infomaniak.lib.applock.Utils.isKeyguardSecure
 import com.infomaniak.mail.MatomoMail.trackScreen
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.utils.AccountUtils
-import com.infomaniak.mail.utils.extensions.getMainApplication
 import io.sentry.Sentry
 import kotlinx.coroutines.runBlocking
 
@@ -49,23 +47,12 @@ open class BaseActivity : AppCompatActivity() {
 
         super.onCreate(savedInstanceState)
         trackScreen()
-    }
-
-    override fun onResume() {
-        super.onResume()
 
-        if (localSettings.isAppLocked && isKeyguardSecure()) with(getMainApplication()) {
-            lastAppClosingTime?.let {
-                LockActivity.lockAfterTimeout(
-                    context = this@BaseActivity,
-                    destinationClass = this::class.java,
-                    lastAppClosingTime = it,
-                    primaryColor = localSettings.accentColor.getPrimary(this),
-                )
-            }
-
-            resetLastAppClosing()
-        }
+        LockActivity.scheduleLockIfNeeded(
+            targetActivity = this,
+            primaryColor = localSettings.accentColor.getPrimary(this),
+            isAppLockEnabled = { localSettings.isAppLocked }
+        )
     }
 
     fun getCurrentFragment(@IdRes fragmentContainerViewId: Int) = supportFragmentManager

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
@@ -24,7 +24,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.infomaniak.lib.applock.Utils.isKeyguardSecure
+import com.infomaniak.lib.applock.LockActivity
 import com.infomaniak.lib.applock.Utils.silentlyReverseSwitch
 import com.infomaniak.lib.core.utils.openAppNotificationSettings
 import com.infomaniak.lib.core.utils.safeBinding
@@ -116,12 +116,15 @@ class SettingsFragment : Fragment() {
         }
 
         settingsAppLock.apply {
-            isVisible = context.isKeyguardSecure()
+            isVisible = LockActivity.hasBiometrics()
             isChecked = localSettings.isAppLocked
             setOnClickListener {
                 trackEvent("settingsGeneral", "lock", value = isChecked.toFloat())
                 // Reverse switch (before official parameter changed) by silent click
-                requireActivity().silentlyReverseSwitch(toggle!!) { isChecked -> localSettings.isAppLocked = isChecked }
+                requireActivity().silentlyReverseSwitch(toggle!!) { isChecked ->
+                    localSettings.isAppLocked = isChecked
+                    if (isChecked) LockActivity.unlock()
+                }
             }
         }
+3 −0		AppLock/build.gradle
+76 −0		AppLock/src/main/java/com/infomaniak/lib/applock/DisplayState.kt
+118 −20		AppLock/src/main/java/com/infomaniak/lib/applock/LockActivity.kt
+1 −8		AppLock/src/main/java/com/infomaniak/lib/applock/Utils.kt