Replaced deprecated UISearchDisplayController with new UISearchController

Endless.xcodeproj/project.pbxproj

@@ -80,6 +80,7 @@
 		01FE82961FC0DC94006E5777 /* BlackIcon-83.5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01FE82951FC0DC94006E5777 /* BlackIcon-83.5@2x.png */; };
 		A024D5AE1ECEF10F00B28CC5 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A024D5AA1ECEF10F00B28CC5 /* Localizable.strings */; };
 		A024D5AF1ECEF10F00B28CC5 /* OnePasswordExtension.strings in Resources */ = {isa = PBXBuildFile; fileRef = A024D5AC1ECEF10F00B28CC5 /* OnePasswordExtension.strings */; };
+		A09A2AA52254BB2E00A3EEF0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A09A2AA72254BB2E00A3EEF0 /* InfoPlist.strings */; };
 		AA9A5FECA2E668F834FDECD9 /* libPods-Endless.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 095BC7BD685DE17FADDBF166 /* libPods-Endless.a */; };
 		D919EA71FF999D55CCC96334 /* libPods-Endless Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC10255E5E506A0C25D6276B /* libPods-Endless Tests.a */; };
 /* End PBXBuildFile section */
@@ -241,6 +242,9 @@
 		A024D5AD1ECEF10F00B28CC5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Endless/Base.lproj/OnePasswordExtension.strings; sourceTree = "<group>"; };
 		A024D5B01ECEF11A00B28CC5 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Endless/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A024D5B11ECEF11A00B28CC5 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Endless/de.lproj/OnePasswordExtension.strings; sourceTree = "<group>"; };
+		A07E147222381A8700B76F77 /* SilenceWarnings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SilenceWarnings.h; sourceTree = "<group>"; };
+		A09A2AA62254BB2E00A3EEF0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		A09A2AA82254BB2F00A3EEF0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		FC10255E5E506A0C25D6276B /* libPods-Endless Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Endless Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDEC322B35C8D861612E24E3 /* Pods-Endless Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Endless Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Endless Tests/Pods-Endless Tests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -360,6 +364,7 @@
 				01D42C3B1E0A37DB00566022 /* Endless.entitlements */,
 				018333CF1A351B3B00670CD1 /* Endless-Prefix.pch */,
 				01801E961A32CA2A002B4718 /* Info.plist */,
+				A09A2AA72254BB2E00A3EEF0 /* InfoPlist.strings */,
 				01801E971A32CA2A002B4718 /* main.m */,
 				01F7CB4C1A52FC4E00F42B73 /* NSString+IPAddress.h */,
 				01F7CB4D1A52FC4E00F42B73 /* NSString+IPAddress.m */,
@@ -372,6 +377,7 @@
 				013E71CF1E5150C000BB0572 /* urlblocker.json */,
 				015748031E208C5000DB2044 /* UIResponder+FirstResponder.h */,
 				015748041E208C5000DB2044 /* UIResponder+FirstResponder.m */,
+				A07E147222381A8700B76F77 /* SilenceWarnings.h */,
 			);
 			name = "Supporting Files";
 			path = Endless;
@@ -602,7 +608,7 @@
 			};
 			buildConfigurationList = 01801E8D1A32CA2A002B4718 /* Build configuration list for PBXProject "Endless" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -633,6 +639,7 @@
 				018333E91A35746500670CD1 /* https-everywhere_rules.plist in Resources */,
 				01801EC31A3360F8002B4718 /* InAppSettings.bundle in Resources */,
 				A024D5AF1ECEF10F00B28CC5 /* OnePasswordExtension.strings in Resources */,
+				A09A2AA52254BB2E00A3EEF0 /* InfoPlist.strings in Resources */,
 				01D7412C1A45F8EB007B7033 /* injected.js in Resources */,
 				01801EA61A32CA2A002B4718 /* Images.xcassets in Resources */,
 				01BFEE4A1E3D3CD60069AC83 /* urlblocker.json in Resources */,
@@ -838,6 +845,15 @@
 			name = OnePasswordExtension.strings;
 			sourceTree = "<group>";
 		};
+		A09A2AA72254BB2E00A3EEF0 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A09A2AA62254BB2E00A3EEF0 /* en */,
+				A09A2AA82254BB2F00A3EEF0 /* de */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

Endless/AppDelegate.m

@@ -111,22 +111,6 @@ - (void)applicationWillTerminate:(UIApplication *)application
 	[application ignoreSnapshotOnNextApplicationLaunch];
 }
 
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
-{
-#ifdef TRACE
-	NSLog(@"[AppDelegate] request to open url at launch: %@", url);
-#endif
-	if ([[[url scheme] lowercaseString] isEqualToString:@"endlesshttp"])
-		url = [NSURL URLWithString:[[url absoluteString] stringByReplacingCharactersInRange:NSMakeRange(0, [@"endlesshttp" length]) withString:@"http"]];
-	else if ([[[url scheme] lowercaseString] isEqualToString:@"endlesshttps"])
-		url = [NSURL URLWithString:[[url absoluteString] stringByReplacingCharactersInRange:NSMakeRange(0, [@"endlesshttps" length]) withString:@"https"]];
-
-	/* delay until we're done drawing the UI */
-	self.urlToOpenAtLaunch = url;
-
-	return YES;
-}
-
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
 {
 #ifdef TRACE
@@ -138,9 +122,22 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDiction
 	else if ([[[url scheme] lowercaseString] isEqualToString:@"endlesshttps"])
 		url = [NSURL URLWithString:[[url absoluteString] stringByReplacingCharactersInRange:NSMakeRange(0, [@"endlesshttps" length]) withString:@"https"]];
 
-	[[self webViewController] dismissViewControllerAnimated:YES completion:nil];
-	[[self webViewController] addNewTabForURL:url];
-
+    // In case, a modal view controller is overlaying the WebViewController,
+    // we need to close it *before* adding a new tab. Otherwise, the UI will
+    // be broken on iPhone-X-type devices: The address field will be in the
+    // notch area.
+    if ([self webViewController].presentedViewController != nil)
+    {
+        [[self webViewController] dismissViewControllerAnimated:YES completion:^{
+            [[self webViewController] addNewTabForURL:url];
+        }];
+    }
+    // If there's no modal view controller, however, the completion block would
+    // never be called.
+    else {
+        [[self webViewController] addNewTabForURL:url];
+    }
+
 	return YES;
 }
 

Endless/HostSettingsController.m

@@ -9,7 +9,11 @@
 #import "HostSettings.h"
 #import "HostSettingsController.h"
 
+#import "SilenceWarnings.h"
+
+SILENCE_DEPRECATION_ON
 #import "XLForm.h"
+SILENCE_WARNINGS_OFF
 
 @interface HostSettingsXLFormViewController : XLFormViewController
 @property (copy, nonatomic) void (^disappearCallback)(HostSettingsXLFormViewController *);
@@ -163,6 +167,8 @@ - (void)showDetailsForHost:(NSString *)thost
 
 	XLFormDescriptor *form = [XLFormDescriptor formDescriptorWithTitle:[host hostname]];
 
+	HostSettingsXLFormViewController *formController = [[HostSettingsXLFormViewController alloc] initWithForm:form];
+
 	/* hostname */
 	{
 		XLFormSectionDescriptor *section = [XLFormSectionDescriptor formSection];
@@ -207,7 +213,24 @@ - (void)showDetailsForHost:(NSString *)thost
 		{
 			XLFormRowDescriptor *row = [XLFormRowDescriptor formRowDescriptorWithTag:HOST_SETTINGS_KEY_ALLOW_WEBRTC rowType:XLFormRowDescriptorTypeSelectorActionSheet title:NSLocalizedString(@"Allow WebRTC", nil)];
 			[self setYesNoSelectorOptionsForSetting:HOST_SETTINGS_KEY_ALLOW_WEBRTC host:host row:row withDefault:(![host isDefault])];
-
+
+			row.onChangeBlock = ^(XLFormOptionsObject * _Nullable oldValue, XLFormOptionsObject * _Nullable newValue, XLFormRowDescriptor * _Nonnull rowDescriptor) {
+				if ([newValue.formValue isEqual:HOST_SETTINGS_VALUE_YES]) {
+					XLFormRowDescriptor *row = [form formRowWithTag:HOST_SETTINGS_KEY_CSP];
+
+					if ([((XLFormOptionsObject *)row.value).formValue isEqual:HOST_SETTINGS_CSP_STRICT]) {
+						for (XLFormOptionsObject *opt in row.selectorOptions) {
+							if ([opt.valueData isEqual:HOST_SETTINGS_CSP_BLOCK_CONNECT]) {
+								row.value = opt;
+								break;
+							}
+						}
+
+						[formController reloadFormRow: row];
+					}
+				}
+			};
+
 			section = [XLFormSectionDescriptor formSection];
 			[section setTitle:@""];
 			[section setFooterTitle:([host isDefault]
@@ -304,7 +327,22 @@ - (void)showDetailsForHost:(NSString *)thost
 			for (XLFormOptionsObject *opt in opts)
 				if ([[opt valueData] isEqualToString:val])
 					[row setValue:opt];
-
+
+			row.onChangeBlock = ^(XLFormOptionsObject * _Nullable oldValue, XLFormOptionsObject * _Nullable newValue, XLFormRowDescriptor * _Nonnull rowDescriptor) {
+				if ([newValue.formValue isEqual:HOST_SETTINGS_CSP_STRICT]) {
+					XLFormRowDescriptor *row = [form formRowWithTag:HOST_SETTINGS_KEY_ALLOW_WEBRTC];
+
+					for (XLFormOptionsObject *opt in row.selectorOptions) {
+						if ([opt.valueData isEqual:HOST_SETTINGS_VALUE_NO]) {
+							row.value = opt;
+							break;
+						}
+					}
+
+					[formController reloadFormRow: row];
+				}
+			};
+
 			section = [XLFormSectionDescriptor formSection];
 			[section setTitle:@""];
 			[section setFooterTitle:([host isDefault]
@@ -358,7 +396,6 @@ - (void)showDetailsForHost:(NSString *)thost
 		}
 	}
 
-	HostSettingsXLFormViewController *formController = [[HostSettingsXLFormViewController alloc] initWithForm:form];
 	[formController setDisappearCallback:^(HostSettingsXLFormViewController *form) {
 		if (![host isDefault])
 			[host setHostname:[[form formValues] objectForKey:HOST_SETTINGS_KEY_HOST]];

Endless/Info.plist

@@ -121,5 +121,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Needed to store the selected image to your photos.</string>
 </dict>
 </plist>

Endless/RuleEditorController.h

@@ -9,13 +9,12 @@
 #import "AppDelegate.h"
 #import "RuleEditorRow.h"
 
-@interface RuleEditorController : UITableViewController <UISearchBarDelegate, UISearchDisplayDelegate, UITableViewDelegate>
+@interface RuleEditorController : UITableViewController <UISearchResultsUpdating>
 
 @property AppDelegate *appDelegate;
 @property NSMutableArray<RuleEditorRow *> *sortedRuleRows;
 @property NSMutableArray<RuleEditorRow *> *inUseRuleRows;
 
-@property UISearchBar *searchBar;
 @property NSMutableArray<RuleEditorRow *> *searchResult;
 
 - (NSString *)ruleDisabledReason:(RuleEditorRow *)row;

Endless/RuleEditorController.m

@@ -9,7 +9,7 @@
 
 @implementation RuleEditorController
 
-UISearchDisplayController *searchDisplayController;
+UISearchController *searchController;
 
 - (id)initWithStyle:(UITableViewStyle)style
 {
@@ -29,19 +29,17 @@ - (void)viewDidLoad
 {
 	[super viewDidLoad];
 
-	self.searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)];
-
-	searchDisplayController = [[UISearchDisplayController alloc] initWithSearchBar:self.searchBar contentsController:self];
-	searchDisplayController.delegate = self;
-	searchDisplayController.searchResultsDataSource = self;
-	searchDisplayController.searchResultsTableView.delegate = self;
+	searchController = [[UISearchController alloc] initWithSearchResultsController:nil];
+	searchController.searchResultsUpdater = self;
+	searchController.obscuresBackgroundDuringPresentation = NO;
+	self.definesPresentationContext = YES;
+	self.navigationItem.searchController = searchController;
 
 	self.tableView.delegate = self;
-
-	[[self tableView] setTableHeaderView:self.searchBar];
 }
 
-#pragma mark - Table view data source
+
+#pragma mark - UITableViewDataSource
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
@@ -60,7 +58,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 {
 	if (section == 0)
 		return [self.inUseRuleRows count];
-	else if (tableView == self.searchDisplayController.searchResultsTableView)
+	else if ([self isFiltering])
 		return [self.searchResult count];
 	else
 		return [self.sortedRuleRows count];
@@ -121,77 +119,96 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
 	[tableView reloadData];
 }
 
+
+#pragma mark - UITableViewDelegate
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 	[tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
-- (BOOL)searchDisplayController:(UISearchDisplayController *)controller shouldReloadTableForSearchString:(NSString *)searchString
+- (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(nonnull NSIndexPath *)indexPath
+{
+	RuleEditorRow *row = [self ruleForTableView:tableView atIndexPath:indexPath];
+
+	if ([self ruleDisabledReason:row] == nil)
+		return NSLocalizedString(@"Disable", nil);
+	else
+		return NSLocalizedString(@"Enable", nil);
+}
+
+
+# pragma mark - UISearchResultsUpdating
+
+- (void)updateSearchResultsForSearchController:(UISearchController *)searchController
 {
+	NSString *search = searchController.searchBar.text;
+
 	[self.searchResult removeAllObjects];
-	
+
 	for (RuleEditorRow *row in self.sortedRuleRows) {
 		if ([row textLabel] != nil) {
-			NSRange range = [[row textLabel] rangeOfString:searchString options:NSCaseInsensitiveSearch];
+			NSRange range = [[row textLabel] rangeOfString:search options:NSCaseInsensitiveSearch];
 
 			if (range.length > 0) {
 				[self.searchResult addObject:row];
 				continue;
 			}
 		}
 		if ([row detailTextLabel] != nil) {
-			NSRange range = [[row detailTextLabel] rangeOfString:searchString options:NSCaseInsensitiveSearch];
-			
+			NSRange range = [[row detailTextLabel] rangeOfString:search options:NSCaseInsensitiveSearch];
+
 			if (range.length > 0) {
 				[self.searchResult addObject:row];
 				continue;
 			}
 		}
 	}
-	
-	return YES;
+
+	[self.tableView reloadData];
 }
 
-- (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(nonnull NSIndexPath *)indexPath
+
+# pragma mark - Public Methods
+
+- (NSString *)ruleDisabledReason:(RuleEditorRow *)row
 {
-	RuleEditorRow *row = [self ruleForTableView:tableView atIndexPath:indexPath];
+	return nil;
+}
 
-	if ([self ruleDisabledReason:row] == nil)
-		return NSLocalizedString(@"Disable", nil);
-	else
-		return NSLocalizedString(@"Enable", nil);
+- (void)disableRuleForRow:(RuleEditorRow *)row withReason:(NSString *)reason
+{
+	abort();
 }
 
+- (void)enableRuleForRow:(RuleEditorRow *)row
+{
+	abort();
+}
+
+
+# pragma mark - Private Methods
+
 - (RuleEditorRow *)ruleForTableView:(UITableView *)tableView atIndexPath:(NSIndexPath *)indexPath
 {
 	NSMutableArray *group;
-	
+
 	if ([indexPath section] == 0)
 		group = [self inUseRuleRows];
-	else if (tableView == self.searchDisplayController.searchResultsTableView)
+	else if ([self isFiltering])
 		group = [self searchResult];
 	else
 		group = [self sortedRuleRows];
-			 
+
 	if (group && [group count] > [indexPath row])
 		return [group objectAtIndex:indexPath.row];
 	else
 		return nil;
 }
 
-- (NSString *)ruleDisabledReason:(RuleEditorRow *)row
+- (BOOL)isFiltering
 {
-	return nil;
-}
-
-- (void)disableRuleForRow:(RuleEditorRow *)row withReason:(NSString *)reason
-{
-	abort();
-}
-
-- (void)enableRuleForRow:(RuleEditorRow *)row
-{
-	abort();
+	return searchController.isActive && searchController.searchBar.text.length != 0;
 }
 
 @end