From 6109d97bf752940ad91d76a6fed6fdab4c9b9f15 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 16 Sep 2022 11:14:11 +0800
Subject: [PATCH] Do not record last leave time if app not unlocked, And Fix
 #275

---
 app/src/main/java/com/hippo/ehviewer/EhApplication.java     | 2 ++
 app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt       | 5 -----
 app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index 832fd3b03..5c437c5eb 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -592,6 +592,8 @@ public class EhApplication extends SceneApplication {
     static class EhlifecycleObserver implements DefaultLifecycleObserver {
         @Override
         public void onPause(@NonNull LifecycleOwner owner) {
+            if (!locked)
+                locked_last_leave_time = System.currentTimeMillis() / 1000;
             locked = true;
         }
     }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
index f95c59201..aaed9d5b7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
@@ -118,11 +118,6 @@ abstract class EhActivity : AppCompatActivity() {
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        locked_last_leave_time = System.currentTimeMillis() / 1000
-    }
-
     private val requestPermissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
index 49f1e732e..67154c6e6 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
@@ -32,8 +32,8 @@ import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 
 class SecurityActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun onResume() {
+        super.onResume()
         if (isAuthenticationSupported(this))
             startAuthentication(getString(R.string.settings_privacy_require_unlock))
         else