[stable-24.0] screen lock improvements

app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt

@@ -15,6 +15,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
+import android.text.format.DateUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -97,11 +98,22 @@ open class BaseActivity : AppCompatActivity() {
 
     fun lockScreenIfConditionsApply() {
         val keyguardManager = getSystemService(KEYGUARD_SERVICE) as KeyguardManager
-        if (!keyguardManager.isKeyguardSecure || !appPreferences.isScreenLocked) return
+        val isKeyguardSecure = keyguardManager.isKeyguardSecure
+        val isScreenLocked = appPreferences.isScreenLocked
+        Log.d(TAG, "lockScreenIfConditionsApply: isKeyguardSecure=$isKeyguardSecure isScreenLocked=$isScreenLocked")
+        if (!isKeyguardSecure || !isScreenLocked) return
         try {
             val timeoutSeconds = SecurityUtils.getIntegerFromStringTimeout(appPreferences.screenLockTimeout)
-            val elapsedSeconds = (System.currentTimeMillis() - appPreferences.lockTimestamp) / 1000
-            if (elapsedSeconds >= timeoutSeconds) {
+            val lockTimestamp = appPreferences.lockTimestamp
+            val elapsedSeconds = (System.currentTimeMillis() - lockTimestamp) / DateUtils.SECOND_IN_MILLIS
+            Log.d(
+                TAG,
+                "lockScreenIfConditionsApply: " +
+                    "timeoutSeconds=$timeoutSeconds " +
+                    "lockTimestamp=$lockTimestamp " +
+                    "elapsedSeconds=$elapsedSeconds"
+            )
+            if (timeoutSeconds == 0 || elapsedSeconds >= timeoutSeconds) {
                 startActivity(Intent(this, LockedActivity::class.java))
             }
         } catch (e: Exception) {
@@ -122,8 +134,20 @@ open class BaseActivity : AppCompatActivity() {
         eventBus.register(this)
     }
 
+    protected open val skipLockCheckOnResume: Boolean = false
+
     public override fun onResume() {
         super.onResume()
+        Log.d(
+            TAG,
+            "onResume: " +
+                "pendingLockCheck=${NextcloudTalkApplication.pendingLockCheck} " +
+                "activity=${this.javaClass.simpleName}"
+        )
+        if (!skipLockCheckOnResume && NextcloudTalkApplication.pendingLockCheck) {
+            NextcloudTalkApplication.pendingLockCheck = false
+            lockScreenIfConditionsApply()
+        }
 
         if (appPreferences.isKeyboardIncognito) {
             val viewGroup = (findViewById<View>(android.R.id.content) as ViewGroup).getChildAt(0) as ViewGroup

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -58,6 +58,10 @@ class MainActivity :
     @Inject
     lateinit var userManager: UserManager
 
+    // MainActivity only routes to ConversationsListActivity or ChatActivity and is never
+    // visible to the user. The lock check must run in the actual destination activity.
+    override val skipLockCheckOnResume: Boolean = true
+
     private val disposables = CompositeDisposable()
 
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
@@ -108,7 +112,6 @@ class MainActivity :
     override fun onStart() {
         Log.d(TAG, "onStart: Activity: " + System.identityHashCode(this).toString())
         super.onStart()
-        lockScreenIfConditionsApply()
     }
 
     override fun onResume() {

app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt

@@ -171,7 +171,10 @@ class NextcloudTalkApplication :
 
         ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
             override fun onStop(owner: LifecycleOwner) {
-                appPreferences.setLockTimestamp(System.currentTimeMillis())
+                val ts = System.currentTimeMillis()
+                Log.d(TAG, "ProcessLifecycle onStop: saving lockTimestamp=$ts")
+                appPreferences.setLockTimestamp(ts)
+                pendingLockCheck = true
             }
         })
 
@@ -270,6 +273,9 @@ class NextcloudTalkApplication :
 
         var sharedApplication: NextcloudTalkApplication? = null
             protected set
+
+        @Volatile
+        var pendingLockCheck = true
         //endregion
 
         //region Setters

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -373,11 +373,6 @@ class ConversationsListActivity : BaseActivity() {
         }
     }
 
-    override fun onStart() {
-        super.onStart()
-        lockScreenIfConditionsApply()
-    }
-
     override fun onResume() {
         super.onResume()
         scrollPositionRestored = false

app/src/main/res/values-v28/arrays.xml

@@ -42,7 +42,7 @@
     </array>
 
     <array name="screen_lock_timeout_entry_int_values">
-        <item>1</item>
+        <item>0</item>
         <item>30</item>
         <item>60</item>
         <item>300</item>

app/src/main/res/values/arrays.xml

@@ -61,7 +61,7 @@
     </array>
 
     <array name="screen_lock_timeout_entry_int_values">
-        <item>1</item>
+        <item>0</item>
         <item>30</item>
         <item>60</item>
         <item>300</item>