fix up settings/cli

github · Aug 11, 2017 · 4615c8e · 4615c8e
1 parent c5de693
commit 4615c8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/SoftU2FTool/CLI.swift b/SoftU2FTool/CLI.swift
@@ -30,10 +30,13 @@ class CLI {
             return true
         } else if args.contains(showTouchidFlag) {
             showTouchid()
+            return true
         } else if args.contains(enableTouchidFlag) {
             enableTouchid()
+            return true
         } else if args.contains(disableTouchidFlag) {
             disableTouchid()
+            return true
         }
 
         return false
@@ -78,9 +81,9 @@ class CLI {
 
     private func showTouchid() {
         if Settings.touchidDisabled {
-            print("SEP storage is enabled")
+            print("TouchID is disabled")
         } else {
-            print("SEP storage is disabled")
+            print("TouchID is enabled")
         }
     }
 
@@ -94,6 +97,6 @@ class CLI {
 
     private func disableTouchid() {
         Settings.disableTouchid()
-        print("TouchID is now disabled for")
+        print("TouchID is now disabled")
     }
 }
diff --git a/SoftU2FTool/Settings.swift b/SoftU2FTool/Settings.swift
@@ -17,15 +17,15 @@ class Settings {
 
     static func enableTouchid() -> Bool {
         if touchidAvailable {
-            UserDefaults.standard.set(true, forKey: touchidDisabledKey)
+            UserDefaults.standard.set(false, forKey: touchidDisabledKey)
             return true
         } else {
             return false
         }
     }
 
     static func disableTouchid() {
-        UserDefaults.standard.set(false, forKey: touchidDisabledKey)
+        UserDefaults.standard.set(true, forKey: touchidDisabledKey)
     }
 
     private static var touchidAvailable: Bool {