diff --git a/XCreds Login Overlay/AppDelegate.swift b/XCreds Login Overlay/AppDelegate.swift index 21f5114..c959736 100644 --- a/XCreds Login Overlay/AppDelegate.swift +++ b/XCreds Login Overlay/AppDelegate.swift @@ -11,7 +11,6 @@ import AppKit @main class App { static func main() { - sleep(5) _ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv) } } diff --git a/XCreds/DesktopLoginWindowController.xib b/XCreds/DesktopLoginWindowController.xib index 23c5766..cd2b86a 100644 --- a/XCreds/DesktopLoginWindowController.xib +++ b/XCreds/DesktopLoginWindowController.xib @@ -40,7 +40,7 @@ - + diff --git a/XCreds/MainController.swift b/XCreds/MainController.swift index 2b1ed17..5f70094 100644 --- a/XCreds/MainController.swift +++ b/XCreds/MainController.swift @@ -88,34 +88,35 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol { } func showSignInWindow(force:Bool=false, forceLoginWindowType:LoginWindowType?=nil ) { + TCSLogWithMark() if isLocalOnlyAccount()==true && force==false{ + TCSLogWithMark() return } if let webViewController = windowController.webViewController{ + TCSLogWithMark() webViewController.webView.isHidden=true } scheduleManager.setNextCheckTime() var forceUsernamePassword = false - var forceCloudPassword = false if let forceLoginWindowType = forceLoginWindowType { - - if forceLoginWindowType == .cloud { - forceCloudPassword = true - } - else { + TCSLogWithMark() + if forceLoginWindowType == .usernamePassword { + TCSLogWithMark() forceUsernamePassword = true } } if forceUsernamePassword == false && (DefaultsOverride.standardOverride.value(forKey: PrefKeys.discoveryURL.rawValue) != nil && DefaultsOverride.standardOverride.value(forKey: PrefKeys.clientID.rawValue) != nil && DefaultsOverride.standardOverride.bool(forKey: PrefKeys.shouldUseROPGForMenuLogin.rawValue) == false) { + TCSLogWithMark() windowController.window!.makeKeyAndOrderFront(self) if let webViewController = windowController.webViewController{ webViewController.webView.isHidden=false - + TCSLogWithMark() windowController.webViewController.updateCredentialsFeedbackDelegate=self windowController.webViewController?.loadPage() } @@ -127,6 +128,7 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol { { if let webView = windowController.webViewController?.webView { webView.isHidden=true + TCSLogWithMark() } if let window = windowController.window{ @@ -136,7 +138,7 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol { if signInViewController == nil { signInViewController = SignInViewController(nibName: "LocalUsersViewController", bundle:bundle) } - + TCSLogWithMark() signInViewController?.isInUserSpace = true signInViewController?.updateCredentialsFeedbackDelegate=self guard let signInViewController = signInViewController else { @@ -144,7 +146,7 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol { } if let contentView = window.contentView { - + TCSLogWithMark() windowController.webViewController.webView.isHidden=true signInViewController.view.wantsLayer=true diff --git a/XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift b/XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift index cb064a2..258a381 100644 --- a/XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift +++ b/XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift @@ -198,13 +198,15 @@ class ControlsViewController: NSViewController, NSPopoverDelegate { override func awakeFromNib() { TCSLogWithMark() super.awakeFromNib() - let licenseState = LicenseChecker().currentLicenseState() - NSEvent.addLocalMonitorForEvents(matching: .flagsChanged, handler: commandKey(evt:)) - self.trialVersionStatusTextField?.isHidden = false NSEvent.addLocalMonitorForEvents(matching: .keyDown, handler: keyDown(key:)) NSEvent.addLocalMonitorForEvents(matching: .keyUp, handler: keyUp(key:)) - setupSystemInfoButton() + NSEvent.addLocalMonitorForEvents(matching: .flagsChanged, handler: commandKey(evt:)) + + + let licenseState = LicenseChecker().currentLicenseState() + self.trialVersionStatusTextField?.isHidden = false + switch licenseState { case .valid(let secRemaining): diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj index 93964b5..c1256de 100644 --- a/xCreds.xcodeproj/project.pbxproj +++ b/xCreds.xcodeproj/project.pbxproj @@ -1685,7 +1685,7 @@ ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1724,7 +1724,7 @@ ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1762,7 +1762,7 @@ ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill.XCreds-AutoFill-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1797,7 +1797,7 @@ ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill.XCreds-AutoFill-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1816,7 +1816,7 @@ ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -1835,7 +1835,7 @@ ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -1869,7 +1869,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1906,7 +1906,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1957,7 +1957,7 @@ DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "auth_mech_fixup/auth_mech_fixup-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -1973,7 +1973,7 @@ DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "auth_mech_fixup/auth_mech_fixup-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -1989,7 +1989,7 @@ DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -2004,7 +2004,7 @@ DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -2035,7 +2035,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -2072,7 +2072,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -2230,7 +2230,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; @@ -2274,7 +2274,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.0; + MARKETING_VERSION = 5.1; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; diff --git a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate index 91012ec..2a9c4ae 100644 Binary files a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate and b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 67e2ad9..3d7c1a0 100644 --- a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,11 +14,43 @@ filePath = "XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "211" - endingLineNumber = "211" + startingLineNumber = "213" + endingLineNumber = "213" landmarkName = "awakeFromNib()" landmarkType = "7"> + + + + + + + +