From b69f936cb1d8621d9629f5344d02ef86e47f83ce Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 3 Apr 2021 11:02:15 -0500
Subject: [PATCH] Change the Mark All As Read confirmation back to an Alert.
 Fixes #2968

---
 iOS/Base.lproj/Main.storyboard                |  5 +++-
 .../MasterTimelineViewController.swift        | 29 +------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 7a89c6297..82dc391e2 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -18,7 +18,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view hidden="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h1Q-FS-jlg" customClass="ArticleSearchBar" customModule="NetNewsWire" customModuleProvider="target">
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h1Q-FS-jlg" customClass="ArticleSearchBar" customModule="NetNewsWire" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="777" width="414" height="36"/>
                                 <color key="backgroundColor" name="barBackgroundColor"/>
                             </view>
@@ -138,6 +138,9 @@
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Mark All as Read"/>
                             </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="markAllAsRead:" destination="Kyk-vK-QRX" id="EVp-xb-0lW"/>
+                            </connections>
                         </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="53V-wq-bat"/>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="93y-8j-WBh"/>
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 27462c202..00caab70a 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -19,15 +19,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	
 	private var refreshProgressView: RefreshProgressView?
 
-	@IBOutlet weak var markAllAsReadButton: UIBarButtonItem! {
-		didSet {
-			if #available(iOS 14, *) {
-				markAllAsReadButton.primaryAction = nil
-			} else {
-				markAllAsReadButton.action = #selector(MasterTimelineViewController.markAllAsRead(_:))
-			}
-		}
-	}
+	@IBOutlet weak var markAllAsReadButton: UIBarButtonItem!
 
 	private var filterButton: UIBarButtonItem!
 	private var firstUnreadButton: UIBarButtonItem!
@@ -666,25 +658,6 @@ private extension MasterTimelineViewController {
 				setToolbarItems(items, animated: false)
 			}
 		}
-		
-		if #available(iOS 14, *) {
-			let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
-			var markAsReadAction: UIAction!
-			
-			if AppDefaults.shared.confirmMarkAllAsRead {
-				markAsReadAction = UIAction(title: title, image: AppAssets.markAllAsReadImage, discoverabilityTitle: "in \(self.title!)") { [weak self] action in
-					self?.coordinator.markAllAsReadInTimeline()
-				}
-				let settingsAction = UIAction(title: NSLocalizedString("Settings", comment: "Settings"), image: UIImage(systemName: "gear")!, discoverabilityTitle: NSLocalizedString("You can turn this confirmation off in Settings.", comment: "You can turn this confirmation off in Settings.")) { [weak self] action in
-					self?.coordinator.showSettings(scrollToArticlesSection: true)
-				}
-				markAllAsReadButton.menu = UIMenu(title: NSLocalizedString(title, comment: title), image: nil, identifier: nil, children: [settingsAction, markAsReadAction])
-				markAllAsReadButton.action = nil
-			} else {
-				markAllAsReadButton.action = #selector(MasterTimelineViewController.markAllAsRead(_:))
-			}
-		}
-		
 	}
 	
 	func updateTitleUnreadCount() {