From a09efd3eeaadf6b673fbf98385464233dc83d455 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 1 Aug 2022 09:48:56 +0800
Subject: [PATCH] Fix #81

---
 app/src/main/AndroidManifest.xml               |  6 ++++++
 .../java/com/hippo/ehviewer/EhApplication.java |  2 +-
 .../java/com/hippo/ehviewer/ui/EhActivity.java |  4 ++++
 .../com/hippo/ehviewer/ui/MainActivity.java    | 18 +++---------------
 .../SecurityScene.kt => SecurityActivity.kt}   | 17 ++++++-----------
 .../ehviewer/ui/fragment/PrivacyFragment.kt    |  2 +-
 6 files changed, 21 insertions(+), 28 deletions(-)
 rename app/src/main/java/com/hippo/ehviewer/ui/{scene/SecurityScene.kt => SecurityActivity.kt} (86%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 666613f3c..02715532d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -145,6 +145,12 @@
             android:label="@string/settings"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name="com.hippo.ehviewer.ui.SecurityActivity"
+            android:configChanges="screenSize"
+            android:label="@string/settings"
+            android:theme="@style/AppTheme" />
+
         <activity
             android:name="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
             android:excludeFromRecents="true"
diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index 3760e721d..f0d33e201 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -107,7 +107,7 @@ public class EhApplication extends SceneApplication {
     private static final boolean DEBUG_PRINT_IMAGE_COUNT = false;
     private static final long DEBUG_PRINT_INTERVAL = 3000L;
 
-    public static boolean locked = false;
+    public static boolean locked = true;
 
     private static EhApplication instance;
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
index f4484f301..7db1df032 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
@@ -17,6 +17,7 @@
 package com.hippo.ehviewer.ui;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -123,6 +124,9 @@ public abstract class EhActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        if (Settings.getSecurity() && SecurityActivity.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
+            startActivity(new Intent(this, SecurityActivity.class));
+        }
         super.onResume();
         if (Settings.getEnabledSecurity()) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 4866563c3..284e548f3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -47,7 +47,6 @@ import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
-import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhTagDatabase;
@@ -67,7 +66,6 @@ import com.hippo.ehviewer.ui.scene.GalleryListScene;
 import com.hippo.ehviewer.ui.scene.GalleryPreviewsScene;
 import com.hippo.ehviewer.ui.scene.HistoryScene;
 import com.hippo.ehviewer.ui.scene.ProgressScene;
-import com.hippo.ehviewer.ui.scene.SecurityScene;
 import com.hippo.ehviewer.ui.scene.SelectSiteScene;
 import com.hippo.ehviewer.ui.scene.SignInScene;
 import com.hippo.ehviewer.ui.scene.SolidScene;
@@ -97,7 +95,7 @@ public final class MainActivity extends StageActivity
     private static final String KEY_NAV_CHECKED_ITEM = "nav_checked_item";
 
     static {
-        registerLaunchMode(SecurityScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
+        registerLaunchMode(SecurityActivity.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(SignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(WebViewSignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(CookieSignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
@@ -141,9 +139,7 @@ public final class MainActivity extends StageActivity
     @NonNull
     @Override
     protected Announcer getLaunchAnnouncer() {
-        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
-            return new Announcer(SecurityScene.class);
-        } else if (EhUtils.needSignedIn(this)) {
+        if (EhUtils.needSignedIn(this)) {
             return new Announcer(SignInScene.class);
         } else if (Settings.getSelectSite()) {
             return new Announcer(SelectSiteScene.class);
@@ -157,12 +153,7 @@ public final class MainActivity extends StageActivity
     // Sometimes scene can't show directly
     private Announcer processAnnouncer(Announcer announcer) {
         if (0 == getSceneCount()) {
-            if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
-                Bundle newArgs = new Bundle();
-                newArgs.putString(SecurityScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
-                newArgs.putBundle(SecurityScene.KEY_TARGET_ARGS, announcer.getArgs());
-                return new Announcer(SecurityScene.class).setArgs(newArgs);
-            } else if (EhUtils.needSignedIn(this)) {
+            if (EhUtils.needSignedIn(this)) {
                 Bundle newArgs = new Bundle();
                 newArgs.putString(SignInScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
                 newArgs.putBundle(SignInScene.KEY_TARGET_ARGS, announcer.getArgs());
@@ -418,9 +409,6 @@ public final class MainActivity extends StageActivity
 
     @Override
     protected void onResume() {
-        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
-            startScene(new Announcer(SecurityScene.class), true);
-        }
         super.onResume();
         setNavCheckedItem(mNavCheckedItem);
         checkClipboardUrl();
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
similarity index 86%
rename from app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
index ceb95c2d0..49f1e732e 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt
@@ -16,10 +16,11 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.hippo.ehviewer.ui.scene
+package com.hippo.ehviewer.ui
 
 import android.content.Context
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
 import androidx.biometric.BiometricPrompt
@@ -30,14 +31,10 @@ import androidx.fragment.app.FragmentActivity
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 
-class SecurityScene : SolidScene() {
-    override fun needShowLeftDrawer(): Boolean {
-        return false
-    }
-
+class SecurityActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (isAuthenticationSupported(requireContext()))
+        if (isAuthenticationSupported(this))
             startAuthentication(getString(R.string.settings_privacy_require_unlock))
         else
             onSuccess()
@@ -52,7 +49,7 @@ class SecurityScene : SolidScene() {
             title = title,
             subtitle = subtitle,
             confirmationRequired = confirmationRequired,
-            executor = ContextCompat.getMainExecutor(requireContext()),
+            executor = ContextCompat.getMainExecutor(this),
             callback = AuthenticationCallback()
         )
     }
@@ -70,7 +67,7 @@ class SecurityScene : SolidScene() {
             errorCode: Int,
             errString: CharSequence
         ) {
-            requireActivity().finish()
+            moveTaskToBack(true)
         }
     }
 
@@ -84,8 +81,6 @@ class SecurityScene : SolidScene() {
 
     private fun onSuccess() {
         EhApplication.locked = false
-        if (stackIndex == 0)
-            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
         finish()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt
index ec1136c15..418b6aed7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt
@@ -22,7 +22,7 @@ import android.os.Bundle
 import androidx.preference.SwitchPreferenceCompat
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.ui.scene.SecurityScene.Companion.isAuthenticationSupported
+import com.hippo.ehviewer.ui.SecurityActivity.Companion.isAuthenticationSupported
 
 /**
  * Created by Mo10 on 2018/2/10.