From e7c48a98dfb86813c785dca55ae383a1b7783ce5 Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Wed, 18 Apr 2018 10:18:32 -0400
Subject: [PATCH] Fix app locking even if app lock is disabled Hide fingerprint
 view if fingerprint is disabled

---
 .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt  | 11 ++++++-----
 app/src/main/java/exh/ui/lock/LockController.kt       |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 6a1650656..668bd58a0 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -158,15 +158,16 @@ class MainActivity : BaseActivity() {
         // --> EH
         //Hook long press hamburger menu to lock
         getToolbarNavigationIcon(toolbar)?.setOnLongClickListener {
-            doLock(true)
-            vibrate(50) // Notify user of lock
-            true
+            if(lockEnabled(preferences)) {
+                doLock(true)
+                vibrate(50) // Notify user of lock
+                true
+            } else false
         }
 
         //Show lock
         if (savedInstanceState == null) {
-            val lockEnabled = lockEnabled(preferences)
-            if (lockEnabled) {
+            if (lockEnabled(preferences)) {
                 //Special case first lock
                 doLock()
 
diff --git a/app/src/main/java/exh/ui/lock/LockController.kt b/app/src/main/java/exh/ui/lock/LockController.kt
index b94312102..463c0085c 100755
--- a/app/src/main/java/exh/ui/lock/LockController.kt
+++ b/app/src/main/java/exh/ui/lock/LockController.kt
@@ -74,6 +74,7 @@ class LockController : NucleusController<LockPresenter>() {
         with(view) {
             //Fingerprint
             if (presenter.useFingerprint) {
+                swirl_container.visibility = View.VISIBLE
                 swirl_container.removeAllViews()
                 val icon = SwirlView(context).apply {
                     val size = dpToPx(context, 60)
@@ -114,6 +115,8 @@ class LockController : NucleusController<LockPresenter>() {
                                 }
                             }
                         }
+            } else {
+                swirl_container.visibility = View.GONE
             }
         }
     }