dont refresh prefs so much

twocanoes · May 27, 2023 · 91ee8dc · 91ee8dc
1 parent b64496b
commit 91ee8dc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 24 deletions.
diff --git a/DefaultsOverride.swift b/DefaultsOverride.swift
@@ -63,7 +63,6 @@ public class DefaultsOverride: UserDefaults {
 
             let scriptRes=cliTask(prefScriptPath)
 
-            TCSLogWithMark(scriptRes)
             if scriptRes.count==0{
                 TCSLogErrorWithMark("script did not return anything")
                 return
@@ -169,7 +168,6 @@ public class DefaultsOverride: UserDefaults {
         return UserDefaults.standard.float(forKey: defaultName)
     }
     override public func double(forKey defaultName: String) -> Double {
-        TCSLogWithMark()
 
         if let defaultName = cachedPrefs[defaultName] as? Double {
             return defaultName
@@ -180,13 +178,6 @@ public class DefaultsOverride: UserDefaults {
     override public func bool(forKey defaultName: String) -> Bool {
         TCSLogWithMark()
 
-        if cachedPrefs.count != 0 {
-            TCSLogWithMark("got prefs")
-
-        }
-        else {
-            TCSLogWithMark("No prefs")
-        }
         if let defaultName = cachedPrefs[defaultName] as? Bool {
             return defaultName
         }

diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWebViewWindowController.swift b/XCredsLoginPlugIn/LoginWindow/LoginWebViewWindowController.swift
@@ -62,14 +62,13 @@ class LoginWebViewWindowController: WebViewWindowController {
 
     func setupLoginWindowAppearance() {
         DispatchQueue.main.async {
-//            TCSLogWithMark("webview frame is \(self.webView.frame.debugDescription)")
 
-            DefaultsOverride.standardOverride.refreshCachedPrefs()
 
             TCSLogWithMark("setting up window...")
 
             self.window?.level = .normal
             self.window?.orderFrontRegardless()
+            self.window?.makeKeyAndOrderFront(self)
 
             self.window?.backgroundColor = NSColor.blue
 
@@ -116,9 +115,6 @@ class LoginWebViewWindowController: WebViewWindowController {
             TCSLogWithMark()
             self.webView.frame=NSMakeRect((screenWidth-CGFloat(loginWindowWidth))/2,(screenHeight-CGFloat(loginWindowHeight))/2, CGFloat(loginWindowWidth), CGFloat(loginWindowHeight))
             TCSLogWithMark()
-//            BackgroundImage
-
-
         }
 //            self.window?.setFrame(NSMakeRect((screenWidth-CGFloat(width))/2,(screenHeight-CGFloat(height))/2, CGFloat(width), CGFloat(height)), display: true, animate: false)
 //        }
@@ -154,12 +150,12 @@ class LoginWebViewWindowController: WebViewWindowController {
             context.duration = 1.0
             context.allowsImplicitAnimation = true
             self.webView?.animator().alphaValue = 0.0
-//            self.window?.setFrame(NSMakeRect(0, 0, 100, 100), display: true, animate: true)
         }, completionHandler: {
             DispatchQueue.main.async{
+                self.webView?.alphaValue = 0.0
 
                 self.window?.close()
-                self.delegate?.allowLogin()
+
             }
         })
     }
@@ -419,6 +415,7 @@ class LoginWebViewWindowController: WebViewWindowController {
 //        }
 //
         DispatchQueue.main.async{
+            TCSLogWithMark("calling allowLogin")
 
             self.delegate?.allowLogin()
 

diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWindowControls.xib b/XCredsLoginPlugIn/LoginWindow/LoginWindowControls.xib
@@ -86,7 +86,7 @@
                                             <rect key="frame" x="397" y="0.0" width="90" height="48"/>
                                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="loginwindow" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="c0y-fU-B6x">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <string key="title">Standard
+                                                <string key="title">Switch
 Login Window</string>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>

diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWindowControlsWindowController.swift b/XCredsLoginPlugIn/LoginWindow/LoginWindowControlsWindowController.swift
@@ -175,6 +175,8 @@ class LoginWindowControlsWindowController: NSWindowController {
 
     @IBAction func refreshButtonPressed(_ sender: Any) {
         TCSLogWithMark("refreshButtonPressed")
+        DefaultsOverride.standardOverride.refreshCachedPrefs()
+
         guard let delegate = delegate else {
             TCSLogWithMark("No delegate set for refresh")
             return
@@ -204,6 +206,7 @@ class LoginWindowControlsWindowController: NSWindowController {
             return
         }
         delegate.setContextString(type: kAuthorizationEnvironmentUsername, value: SpecialUsers.shutdown.rawValue)
+        TCSLogWithMark("calling allowLogin")
 
         delegate.allowLogin()
     }

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift
@@ -128,6 +128,8 @@ protocol XCredsMechanismProtocol {
     func allowLogin() {
         TCSLogWithMark("\(#function) \(#file):\(#line)")
         let error = mechCallbacks.SetResult(mechEngine, .allow)
+        TCSLogWithMark("\(#function) \(#file):\(#line)")
+
         if error != noErr {
             TCSLogErrorWithMark("Error: \(error)")
         }

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsLoginMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsLoginMechanism.swift
@@ -215,7 +215,7 @@ import Cocoa
             TCSLogWithMark("Dismissing loginWindowWindowController")
             loginWebViewWindowController?.loginTransition()
         }
-        TCSLogWithMark("calling super allowLogin")
+        TCSLogWithMark("calling allowLogin")
         super.allowLogin()
     }
     override func denyLogin() {

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1091,7 +1091,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1128,7 +1128,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1193,7 +1193,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1229,7 +1229,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1378,7 +1378,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1413,7 +1413,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4058;
+				CURRENT_PROJECT_VERSION = 4067;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate