added about menu and quit; fixed issue with password keychain saving

Lotusshaney · Jun 5, 2022 · adccbd8 · adccbd8
1 parent 749b879
commit adccbd8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 70 deletions.
diff --git a/XCreds/MainController.swift b/XCreds/MainController.swift
@@ -63,7 +63,7 @@ class MainController: NSObject {
 
  if verifyCloudPassword == cloudPassword {
  try? PasswordUtils.changeLocalUserAndKeychainPassword(localPassword, newPassword1: cloudPassword, newPassword2: cloudPassword)
- let err = keychainUtil.updatePassword("local password", pass: localPassword)
+ let err = keychainUtil.updatePassword("local password", pass: cloudPassword)
  if err == false {
  //TODO: Log Error
  }

diff --git a/XCreds/MainMenu.swift b/XCreds/MainMenu.swift
@@ -43,11 +43,15 @@ class MainMenu: NSObject, NSMenuDelegate {
  mainMenu.removeAllItems()
 
  // add menu items
+ let aboutMenuItem = NSMenuItem(title: "About", action:#selector(NSApp.orderFrontStandardAboutPanel(_:)), keyEquivalent: "")
+ let quitMenuItem = NSMenuItem(title: "Quit", action:#selector(NSApp.terminate(_:)), keyEquivalent: "")
+
 
  mainMenu.addItem(SignInMenuItem())
  mainMenu.addItem(CheckTokenMenuItem())
- mainMenu.addItem(NSMenuItem.separator())
  mainMenu.addItem(PrefsMenuItem())
+ mainMenu.addItem(aboutMenuItem)
+ mainMenu.addItem(quitMenuItem)
 
  }
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
  CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1254;
+ CURRENT_PROJECT_VERSION = 1255;
  DEVELOPMENT_TEAM = UXP6YEHSPW;
  ENABLE_HARDENED_RUNTIME = YES;
  GENERATE_INFOPLIST_FILE = YES;
@@ -398,7 +398,7 @@
  CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1254;
+ CURRENT_PROJECT_VERSION = 1255;
  DEVELOPMENT_TEAM = UXP6YEHSPW;
  ENABLE_HARDENED_RUNTIME = YES;
  GENERATE_INFOPLIST_FILE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,70 +3,4 @@
  uuid = "94C20054-8AB3-42DB-93A7-A3026166D6FC"
  type = "1"
  version = "2.0">
- <Breakpoints>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- uuid = "DFC201A3-54C3-4E60-AA49-BAD35EB8D20B"
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "XCreds/TokenManager.swift"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "43"
- endingLineNumber = "43"
- landmarkName = "getNewAccessToken(completion:)"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- uuid = "38AC0916-97CA-44F6-9E5F-689EE26C9ABC"
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "XCreds/TokenManager.swift"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "74"
- endingLineNumber = "74"
- landmarkName = "getNewAccessToken(completion:)"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- uuid = "E88F8AB5-ABD1-4FF9-936A-330CC588B428"
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "XCreds/TokenManager.swift"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "65"
- endingLineNumber = "65"
- landmarkName = "getNewAccessToken(completion:)"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- uuid = "7713A147-4222-49E5-AFE0-D78342383967"
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "XCreds/MainController.swift"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "19"
- endingLineNumber = "19"
- landmarkName = "run()"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- </Breakpoints>
 </Bucket>