Merge branch 'ios-release' into main

iOS/Account/FeedWranglerAccountViewController.swift

@@ -73,17 +73,22 @@ class FeedWranglerAccountViewController: UITableViewController {
 	}
 	
 	@IBAction func action(_ sender: Any) {
-		
 		guard let email = emailTextField.text, let password = passwordTextField.text else {
 			showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
 			return
 		}
+		// When you fill in the email address via auto-complete it adds extra whitespace
+		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
+
+		guard !AccountManager.shared.duplicateServiceAccount(type: .feedWrangler, username: trimmedEmail) else {
+			showError(NSLocalizedString("There is already a FeedWrangler account with that username created.", comment: "Duplicate Error"))
+			return
+		}
+		
 		resignFirstResponder()
 		toggleActivityIndicatorAnimation(visible: true)
 		setNavigationEnabled(to: false)
 		
-		// When you fill in the email address via auto-complete it adds extra whitespace
-		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
 		let credentials = Credentials(type: .feedWranglerBasic, username: trimmedEmail, secret: password)
 		Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in
 			

iOS/Account/FeedbinAccountViewController.swift

@@ -74,17 +74,23 @@ class FeedbinAccountViewController: UITableViewController {
 	}
 	
 	@IBAction func action(_ sender: Any) {
-		
 		guard let email = emailTextField.text, let password = passwordTextField.text else {
 			showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
 			return
 		}
-		resignFirstResponder()
-		toggleActivityIndicatorAnimation(visible: true)
-		setNavigationEnabled(to: false)
 		
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
+		
+		guard !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
+			showError(NSLocalizedString("There is already a Feedbin account with that username created.", comment: "Duplicate Error"))
+			return
+		}
+		
+		resignFirstResponder()
+		toggleActivityIndicatorAnimation(visible: true)
+		setNavigationEnabled(to: false)
+
 		let credentials = Credentials(type: .basic, username: trimmedEmail, secret: password)
 		Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
 			self.toggleActivityIndicatorAnimation(visible: false)

iOS/Add/AddFeedViewController.swift

@@ -100,7 +100,6 @@ class AddFeedViewController: UITableViewController {
 		let normalizedURLString = urlString.normalizedURL
 		
 		guard !normalizedURLString.isEmpty, let url = URL(unicodeString: normalizedURLString) else {
-			delegate?.processingDidCancel()
 			return
 		}
 		

iOS/AppDelegate.swift

@@ -93,9 +93,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		DispatchQueue.main.async {
 			self.unreadCount = AccountManager.shared.unreadCount
 		}
-				
-		UNUserNotificationCenter.current().getNotificationSettings { (settings) in
-			if settings.authorizationStatus == .authorized {
+		
+		UNUserNotificationCenter.current().requestAuthorization(options:[.badge, .sound, .alert]) { (granted, error) in
+			if granted {
 				DispatchQueue.main.async {
 					UIApplication.shared.registerForRemoteNotifications()
 				}

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -616,13 +616,15 @@ private extension MasterTimelineViewController {
 		}
 
 		tableView.selectRow(at: nil, animated: false, scrollPosition: .top)
-		let dataSourceSnapshot = dataSource.snapshot()
-		if resetScroll && dataSourceSnapshot.indexOfSection(0) != nil && dataSourceSnapshot.itemIdentifiers(inSection: 0).count > 0 {
-			tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
+
+		if resetScroll {
+			let snapshot = dataSource.snapshot()
+			if snapshot.sectionIdentifiers.count > 0 && snapshot.itemIdentifiers(inSection: 0).count > 0 {
+				tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
+			}
 		}
 		
 		updateToolbar()
-
 	}
 	
 	func updateToolbar() {

xcconfig/common/NetNewsWire_ios_target_common.xcconfig

@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
-MARKETING_VERSION = 5.0.3
-CURRENT_PROJECT_VERSION = 50
+MARKETING_VERSION = 5.0.4
+CURRENT_PROJECT_VERSION = 53
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon