From 63ca2ae83eb68d3e992850845804f0a476f4ed72 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Thu, 16 Apr 2020 17:13:08 -0400 Subject: [PATCH] Can lower deployment target to 10.10 --- .../project.pbxproj | 2 ++ platform-darwin/Source/MPAlgorithmV0.m | 3 +-- .../Source/Mac/MPSitesWindowController.xib | 18 +++++++++--------- .../Source/iOS/MPSitesViewController.m | 8 +------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index 20e03626..e370b685 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/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", diff --git a/platform-darwin/Source/MPAlgorithmV0.m b/platform-darwin/Source/MPAlgorithmV0.m index e2e1bf52..01074990 100644 --- a/platform-darwin/Source/MPAlgorithmV0.m +++ b/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]; } diff --git a/platform-darwin/Source/Mac/MPSitesWindowController.xib b/platform-darwin/Source/Mac/MPSitesWindowController.xib index 3b321c21..2bcfb171 100644 --- a/platform-darwin/Source/Mac/MPSitesWindowController.xib +++ b/platform-darwin/Source/Mac/MPSitesWindowController.xib @@ -50,7 +50,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -600,7 +600,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + @@ -892,7 +892,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + @@ -929,7 +929,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + @@ -966,7 +966,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + @@ -1022,7 +1022,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + @@ -1178,7 +1178,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit. - + "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. diff --git a/platform-darwin/Source/iOS/MPSitesViewController.m b/platform-darwin/Source/iOS/MPSitesViewController.m index 645bd621..c165086b 100644 --- a/platform-darwin/Source/iOS/MPSitesViewController.m +++ b/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; - else - [self.searchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) { - if ([subview isKindOfClass:[UITextField class]]) - ((UITextField *)subview).keyboardAppearance = UIKeyboardAppearanceDark; - } recurse:YES]; + self.searchBar.keyboardAppearance = UIKeyboardAppearanceDark; } - (void)viewWillAppear:(BOOL)animated {