Project update.

platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj

@@ -3220,6 +3220,7 @@
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
 					"-DMPW_JSON=1",
@@ -3258,6 +3259,7 @@
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
 					"-DMPW_JSON=1",

platform-darwin/Source/MPAlgorithmV0.m

@@ -81,8 +81,7 @@ static NSOperationQueue *_mpwQueue = nil;
     }
 
     NSOperation *operation = [NSBlockOperation blockOperationWithBlock:operationBlock];
-    if ([operation respondsToSelector:@selector( qualityOfService )])
+    operation.qualityOfService = NSQualityOfServiceUserInitiated;
-        operation.qualityOfService = NSQualityOfServiceUserInitiated;
     [_mpwQueue addOperations:@[ operation ] waitUntilFinished:YES];
 }
 

platform-darwin/Source/Mac/Base.lproj/MainMenu.xib

@@ -66,7 +66,7 @@
                                                 <action selector="exportSitesSecure:" target="494" id="LVH-es-imA"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Your passwords are hidden." enabled="NO" id="ybY-P3-eao">
+                                        <menuItem title="Your passwords are not visible." enabled="NO" id="ybY-P3-eao">
                                             <attributedString key="attributedTitle">
                                                 <fragment content="Your passwords are not visible.">
                                                     <attributes>
@@ -83,7 +83,7 @@
                                                 <action selector="exportSitesReveal:" target="494" id="1IW-VT-Oeu"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Handy for backups - keep it in a safe location!" enabled="NO" id="cQu-oR-SUa">
+                                        <menuItem title="Keep this file secure or delete it when you're done with it!" enabled="NO" id="cQu-oR-SUa">
                                             <attributedString key="attributedTitle">
                                                 <fragment content="Keep this file secure or delete it when you're done with it!">
                                                     <attributes>
@@ -210,7 +210,7 @@
                             </menuItem>
                             <menuItem title="Crash and usage information is anonymized and sent to development." enabled="NO" id="WfD-lX-C93">
                                 <attributedString key="attributedTitle">
-                                    <fragment content="Save the password in your keychain so you don't need to enter it again.">
+                                    <fragment content="Crash and usage information is anonymized and sent to development.">
                                         <attributes>
                                             <font key="NSFont" size="11" name="Helvetica"/>
                                             <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" firstLineHeadIndent="8"/>

platform-darwin/Source/Mac/MPMacAppDelegate.m

@@ -723,10 +723,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }
 
     BOOL loginItemEnabled = [self loginItemEnabled];
+    self.initialWindowController.openAtLoginButton.state = loginItemEnabled? NSOnState: NSOffState;
     self.openAtLoginItem.state = loginItemEnabled? NSOnState: NSOffState;
     self.showFullScreenItem.state = [[MPMacConfig get].fullScreen boolValue]? NSOnState: NSOffState;
-    self.initialWindowController.openAtLoginButton.state = loginItemEnabled? NSOnState: NSOffState;
+    self.rememberPasswordItem.state = [[MPMacConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
-    self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
+    self.diagnosticsItem.state = [[MPMacConfig get].sendInfo boolValue]? NSOnState: NSOffState;
+    self.hidePasswordsItem.state = [[MPMacConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
+    self.rememberPasswordItem.state = [[MPMacConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
 
     self.savePasswordItem.state = activeUser.saveKey? NSOnState: NSOffState;
     if (!activeUser) {

platform-darwin/Source/Mac/MPSitesWindowController.xib

@@ -50,7 +50,7 @@
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Your password for apple.com (hit &lt;⏎ enter&gt; to copy):" id="CgJ-XZ-6Hy">
-                                    <font key="font" metaFont="message" size="11"/>
+                                    <font key="font" metaFont="menu" size="11"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
@@ -78,7 +78,7 @@
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="No password set.  Click &quot;Set Password&quot; on the bottom to set one." id="eDQ-iz-97a">
-                                    <font key="font" metaFont="message" size="11"/>
+                                    <font key="font" metaFont="menu" size="11"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
@@ -345,7 +345,7 @@
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘," id="Xm1-qb-6EP">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -600,7 +600,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                         </shadow>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘P" id="MyN-x6-dMk">
-                                            <font key="font" metaFont="message" size="11"/>
+                                            <font key="font" metaFont="menu" size="11"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -892,7 +892,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password Number:" id="weR-33-U49">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -929,7 +929,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password Version:" id="E77-5t-EKJ">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -966,7 +966,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Upgrade your site's algorithm version for maximum protection:" id="3ds-qG-YNd">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -1022,7 +1022,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘T" id="HFM-Bk-akx">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -1178,7 +1178,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kCO-1M-Wz1">
                         <rect key="frame" x="10" y="12" width="390" height="92"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="kl0-P1-6ZY">
-                            <font key="font" metaFont="message" size="11"/>
+                            <font key="font" metaFont="menu" size="11"/>
                             <string key="title">"Personal password" allows you to store your own password.  It cannot be regenerated in the event of loss.  "Device private password" is similar but will never leave your device: it cannot be synced, backed up or exported.</string>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist

@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <dict>
+<dict>
-        <key>CFBundleDevelopmentRegion</key>
+	<key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
+	<string>en</string>
-        <key>CFBundleExecutable</key>
+	<key>CFBundleExecutable</key>
-        <string>${EXECUTABLE_NAME}</string>
+	<string>${EXECUTABLE_NAME}</string>
-        <key>CFBundleIconFile</key>
+	<key>CFBundleIconFile</key>
-        <string></string>
+	<string></string>
-        <key>CFBundleIdentifier</key>
+	<key>CFBundleIdentifier</key>
-        <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-        <key>CFBundleInfoDictionaryVersion</key>
+	<key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
+	<string>6.0</string>
-        <key>CFBundleName</key>
+	<key>CFBundleName</key>
-        <string>${PRODUCT_NAME}</string>
+	<string>${PRODUCT_NAME}</string>
-        <key>CFBundlePackageType</key>
+	<key>CFBundlePackageType</key>
-        <string>APPL</string>
+	<string>APPL</string>
-        <key>CFBundleShortVersionString</key>
+	<key>CFBundleShortVersionString</key>
-        <string>1.0</string>
+	<string>1.0</string>
-        <key>CFBundleSignature</key>
+	<key>CFBundleSignature</key>
-        <string>????</string>
+	<string>????</string>
-        <key>CFBundleVersion</key>
+	<key>CFBundleVersion</key>
-        <string>1</string>
+	<string>1</string>
-        <key>LSBackgroundOnly</key>
+	<key>LSApplicationCategoryType</key>
-        <true/>
+	<string>public.app-category.productivity</string>
-        <key>LSMinimumSystemVersion</key>
+	<key>LSBackgroundOnly</key>
-        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<true/>
-        <key>NSHumanReadableCopyright</key>
+	<key>LSMinimumSystemVersion</key>
-        <string>Copyright © 2013 Maarten Billemont. All rights reserved.</string>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
-        <key>NSPrincipalClass</key>
+	<key>NSHumanReadableCopyright</key>
-        <string>NSApplication</string>
+	<string>Copyright © 2013 Maarten Billemont. All rights reserved.</string>
-    </dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
 </plist>

platform-darwin/Source/iOS/MPSitesViewController.m

@@ -64,13 +64,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
         self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     [self.collectionView automaticallyAdjustInsetsForKeyboard];
     self.searchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    if ([self.searchBar respondsToSelector:@selector( keyboardAppearance )])
+    self.searchBar.keyboardAppearance = UIKeyboardAppearanceDark;
-        self.searchBar.keyboardAppearance = UIKeyboardAppearanceDark;
-    else
-        [self.searchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
-            if ([subview isKindOfClass:[UITextField class]])
-                ((UITextField *)subview).keyboardAppearance = UIKeyboardAppearanceDark;
-        }                      recurse:YES];
 }
 
 - (void)viewWillAppear:(BOOL)animated {