Optimization of the pass lock screen. Remove of the bug.

nsnull0 · Jan 8, 2018 · 37e2521 · 37e2521
1 parent c228a7c
commit 37e2521
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Trust/Core/Initializers/TouchRegistrar.swift b/Trust/Core/Initializers/TouchRegistrar.swift
@@ -30,9 +30,6 @@ class TouchRegistrar {
             passcodeAttemptLimit: 5,
             splashViewControllerClass: SplashViewController.self
         )
-        VENTouchLock.sharedInstance().backgroundLockVisible = true
-        VENTouchLockAppearance().splashShouldEmbedInNavigationController = true
-        VENTouchLockAppearance().touchIDCancelPresentsPasscodeViewController = false
     }
 
     func unregister() {

diff --git a/Trust/Settings/ViewControllers/SettingsViewController.swift b/Trust/Settings/ViewControllers/SettingsViewController.swift
@@ -142,8 +142,9 @@ class SettingsViewController: FormViewController {
                         row.value = result
                         row.updateCell()
                     }
-                    VENTouchLock.setShouldUseTouchID(true)
-                    VENTouchLock.sharedInstance().backgroundLockVisible = false
+                    if VENTouchLock.canUseTouchID() {
+                        VENTouchLock.setShouldUseTouchID(true)
+                    }
                 } else {
                     VENTouchLock.sharedInstance().deletePasscode()
                 }

diff --git a/Trust/Settings/ViewControllers/SplashViewController.swift b/Trust/Settings/ViewControllers/SplashViewController.swift
@@ -6,7 +6,16 @@ import VENTouchLock
 class SplashViewController: VENTouchLockSplashViewController {
 
     let label = UILabel()
-
+
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        self.setIsSnapshot(true)
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -30,6 +39,7 @@ class SplashViewController: VENTouchLockSplashViewController {
             label.trailingAnchor.constraint(equalTo: view.readableContentGuide.trailingAnchor),
             label.leadingAnchor.constraint(equalTo: view.readableContentGuide.leadingAnchor),
         ])
+        self.showUnlock(animated: true)
     }
 
     override func dismiss(withUnlockSuccess success: Bool, unlockType: VENTouchLockSplashViewControllerUnlockType, animated: Bool) {
@@ -83,9 +93,4 @@ class SplashViewController: VENTouchLockSplashViewController {
             label.text = error.errorDescription
         }
     }
-
-    override func setIsSnapshot(_ isSnapshotViewController: Bool) {
-        transition(to: .new)
-        return super.setIsSnapshot(isSnapshotViewController)
-    }
 }