Remove redundant #available(iOS 14, *) checks

mokagio · mokagio · commit 3069cb7fd81b · 2022-10-25T23:21:38.000+11:00
With iOS 14 as the minimum deployment target, they all return `true`.
diff --git a/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift b/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift
@@ -9,11 +9,10 @@ extension UITextField {
     /// Once we drop support for iOS 14, we could remove this extension entirely.
     ///
     public class func shouldActivateWorkaroundForBulgarianKeyboardCrash() -> Bool {
-        if #available(iOS 14.0, *) {
-            return true
-        }
-
-        return false
+        // FIXME: Do _all_ versions above iOS 14 require the workaround?
+        //
+        // This code was changed to `true` at the time of making iOS 14 the minimum target.
+        true
     }
 
     /// We're swizzling `UITextField.becomeFirstResponder()` so that we can fix an issue with
diff --git a/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift b/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift
@@ -60,8 +60,7 @@ class WPMediaPickerForKanvas: WPNavigationMediaPickerViewController, MediaPicker
         photoPicker.dataSource = WPPHAssetDataSource.sharedInstance()
         photoPicker.tabBarItem = UITabBarItem(title: Constants.photosTabBarTitle, image: Constants.photosTabBarIcon, tag: 0)
 
-        if #available(iOS 14.0, *),
-           FeatureFlag.mediaPickerPermissionsNotice.enabled {
+        if FeatureFlag.mediaPickerPermissionsNotice.enabled {
             photoPicker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self)
         }
 
@@ -182,8 +181,7 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {
-        guard #available(iOS 14.0, *),
-              FeatureFlag.mediaPickerPermissionsNotice.enabled,
+        guard FeatureFlag.mediaPickerPermissionsNotice.enabled,
               picker.dataSource is WPPHAssetDataSource else {
             return false
         }
@@ -192,19 +190,14 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize {
-        guard #available(iOS 14.0, *) else {
-            return .zero
-        }
-
         let header = DeviceMediaPermissionsHeader()
         header.translatesAutoresizingMaskIntoConstraints = false
 
         return header.referenceSizeInView(picker.view)
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) {
-        guard #available(iOS 14.0, *),
-              let headerView = headerView as? DeviceMediaPermissionsHeader else {
+        guard let headerView = headerView as? DeviceMediaPermissionsHeader else {
             return
         }
 
diff --git a/WordPress/Classes/Stores/StatsWidgetsStore.swift b/WordPress/Classes/Stores/StatsWidgetsStore.swift
@@ -18,33 +18,24 @@ class StatsWidgetsStore {
         if let newTodayData = refreshStats(type: HomeWidgetTodayData.self) {
             HomeWidgetTodayData.write(items: newTodayData)
 
-            if #available(iOS 14.0, *) {
-                WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetTodayKind)
-            }
+            WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetTodayKind)
         }
 
         if let newAllTimeData = refreshStats(type: HomeWidgetAllTimeData.self) {
             HomeWidgetAllTimeData.write(items: newAllTimeData)
 
-            if #available(iOS 14.0, *) {
-                WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetAllTimeKind)
-            }
+            WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetAllTimeKind)
         }
 
         if let newThisWeekData = refreshStats(type: HomeWidgetThisWeekData.self) {
             HomeWidgetThisWeekData.write(items: newThisWeekData)
 
-            if #available(iOS 14.0, *) {
-                WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetThisWeekKind)
-            }
+            WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetThisWeekKind)
         }
     }
 
     /// Initialize the local cache for widgets, if it does not exist
     func initializeStatsWidgetsIfNeeded() {
-        guard #available(iOS 14.0, *) else {
-            return
-        }
         if HomeWidgetTodayData.read() == nil {
             DDLogInfo("StatsWidgets: Writing initialization data into HomeWidgetTodayData.plist")
             HomeWidgetTodayData.write(items: initializeHomeWidgetData(type: HomeWidgetTodayData.self))
@@ -69,8 +60,7 @@ class StatsWidgetsStore {
     ///   - widgetType: concrete type of the widget
     ///   - stats: stats to be stored
     func storeHomeWidgetData<T: HomeWidgetData>(widgetType: T.Type, stats: Codable) {
-        guard #available(iOS 14.0, *),
-              let siteID = SiteStatsInformation.sharedInstance.siteID else {
+        guard let siteID = SiteStatsInformation.sharedInstance.siteID else {
             return
         }
 
@@ -242,9 +232,6 @@ private extension StatsWidgetsStore {
 // MARK: - Extract this week data
 extension StatsWidgetsStore {
     func updateThisWeekHomeWidget(summary: StatsSummaryTimeIntervalData?) {
-        guard #available(iOS 14.0, *) else {
-            return
-        }
         switch summary?.period {
         case .day:
             guard summary?.periodEndDate == StatsDataHelper.currentDateForSite().normalizedDate() else {
@@ -268,10 +255,6 @@ private extension StatsWidgetsStore {
     /// Observes WPAccountDefaultWordPressComAccountChanged notification and reloads widget data based on the state of account.
     /// The site data is not yet loaded after this notification and widget data cannot be cached for newly signed in account.
     func observeAccountChangesForWidgets() {
-        guard #available(iOS 14.0, *) else {
-            return
-        }
-
         NotificationCenter.default.addObserver(forName: .WPAccountDefaultWordPressComAccountChanged,
                                                object: nil,
                                                queue: nil) { notification in
@@ -293,10 +276,6 @@ private extension StatsWidgetsStore {
     /// Observes WPSigninDidFinishNotification notification and initializes the widget.
     /// The site data is loaded after this notification and widget data can be cached.
     func observeAccountSignInForWidgets() {
-        guard #available(iOS 14.0, *) else {
-            return
-        }
-
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: WordPressAuthenticator.WPSigninDidFinishNotification),
                                                object: nil,
                                                queue: nil) { [weak self] _ in
diff --git a/WordPress/Classes/Utility/InteractiveNotificationsManager.swift b/WordPress/Classes/Utility/InteractiveNotificationsManager.swift
@@ -618,11 +618,7 @@ extension InteractiveNotificationsManager: UNUserNotificationCenterDelegate {
         if notification.request.content.categoryIdentifier == NoteCategoryDefinition.bloggingReminderWeekly.rawValue
             || notification.request.content.categoryIdentifier == NoteCategoryDefinition.weeklyRoundup.rawValue {
 
-            if #available(iOS 14.0, *) {
-                completionHandler([.banner, .list, .sound])
-            } else {
-                completionHandler([.alert, .sound])
-            }
+            completionHandler([.banner, .list, .sound])
             return
         }
 
diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
@@ -636,8 +636,7 @@ class AztecPostViewController: UIViewController, PostEditor {
 
         // Required to work around an issue present in iOS 14 beta 2
         // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460
-        if #available(iOS 14.0, *),
-            presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {
+        if presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {
             dismiss(animated: true)
         }
     }
@@ -1326,8 +1325,7 @@ private extension AztecPostViewController {
 
         alert.addCancelActionWithTitle(MoreSheetAlert.keepEditingTitle)
 
-        if #available(iOS 14.0, *),
-            let button = navigationBarManager.moreBarButtonItem.customView {
+        if let button = navigationBarManager.moreBarButtonItem.customView {
             // Required to work around an issue present in iOS 14 beta 2
             // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460
             alert.popoverPresentationController?.sourceRect = button.convert(button.bounds, to: navigationController?.navigationBar)
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift
@@ -92,10 +92,6 @@ extension SitePickerViewController {
     }
 
     func showEmojiPicker() {
-        guard #available(iOS 14.0, *) else {
-            return
-        }
-
         var pickerView = SiteIconPickerView()
 
         pickerView.onCompletion = { [weak self] image in
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift
@@ -88,11 +88,7 @@ extension SitePickerViewController: BlogDetailHeaderViewDelegate {
             showUpdateSiteIconAlert()
         }
 
-        if #available(iOS 14.0, *) {
-            showSiteIconSelectionAlert()
-        } else {
-            showUpdateSiteIconAlert()
-        }
+        showSiteIconSelectionAlert()
     }
 
     func siteIconReceivedDroppedImage(_ image: UIImage?) {
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
@@ -68,8 +68,7 @@ class GutenbergMediaPickerHelper: NSObject {
         picker.delegate = self
         picker.mediaPicker.registerClass(forReusableCellOverlayViews: DisabledVideoOverlay.self)
 
-        if #available(iOS 14.0, *),
-           FeatureFlag.mediaPickerPermissionsNotice.enabled {
+        if FeatureFlag.mediaPickerPermissionsNotice.enabled {
             picker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self)
         }
 
@@ -137,8 +136,7 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {
-        guard #available(iOS 14.0, *),
-              FeatureFlag.mediaPickerPermissionsNotice.enabled,
+        guard FeatureFlag.mediaPickerPermissionsNotice.enabled,
               picker !== cameraPicker else {
             return false
         }
@@ -147,19 +145,14 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize {
-        guard #available(iOS 14.0, *) else {
-            return .zero
-        }
-
         let header = DeviceMediaPermissionsHeader()
         header.translatesAutoresizingMaskIntoConstraints = false
 
         return header.referenceSizeInView(picker.view)
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) {
-        guard #available(iOS 14.0, *),
-              let headerView = headerView as? DeviceMediaPermissionsHeader else {
+        guard let headerView = headerView as? DeviceMediaPermissionsHeader else {
             return
         }
 
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift
@@ -73,8 +73,7 @@ extension GutenbergViewController {
             ActionDispatcher.dispatch(NoticeAction.unlock)
         }
 
-        if #available(iOS 14.0, *),
-            let button = navigationBarManager.moreBarButtonItem.customView {
+        if let button = navigationBarManager.moreBarButtonItem.customView {
             // Required to work around an issue present in iOS 14 beta 2
             // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460
             alert.popoverPresentationController?.sourceRect = button.convert(button.bounds, to: navigationController?.navigationBar)
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
@@ -402,8 +402,7 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega
 
         // Required to work around an issue present in iOS 14 beta 2
         // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460
-        if #available(iOS 14.0, *),
-            presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {
+        if presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {
             dismiss(animated: true)
         }
     }
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
@@ -74,20 +74,16 @@ extension Gutenberg.MediaType {
     private func getTypesFrom(_ allTypes: [String], conformingTo uttype: CFString) -> [String] {
 
         return allTypes.filter {
-            if #available(iOS 14.0, *) {
-                guard let allowedType = UTType($0), let requiredType = UTType(uttype as String) else {
-                    return false
-                }
-                // Sometimes the compared type could be a supertype
-                // For example a self-hosted site without Jetpack may have "public.content" as allowedType
-                // Although "public.audio" conforms to "public.content", it's not true the other way around
-                if allowedType.isSupertype(of: requiredType) {
-                    return true
-                }
-                return allowedType.conforms(to: requiredType)
-            } else {
-                return UTTypeConformsTo($0 as CFString, uttype)
+            guard let allowedType = UTType($0), let requiredType = UTType(uttype as String) else {
+                return false
             }
+            // Sometimes the compared type could be a supertype
+            // For example a self-hosted site without Jetpack may have "public.content" as allowedType
+            // Although "public.audio" conforms to "public.content", it's not true the other way around
+            if allowedType.isSupertype(of: requiredType) {
+                return true
+            }
+            return allowedType.conforms(to: requiredType)
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift
@@ -24,8 +24,7 @@ final class MediaLibraryPicker: NSObject {
         picker.delegate = delegate
         picker.mediaPicker.registerClass(forReusableCellOverlayViews: DisabledVideoOverlay.self)
 
-        if #available(iOS 14.0, *),
-           FeatureFlag.mediaPickerPermissionsNotice.enabled {
+        if FeatureFlag.mediaPickerPermissionsNotice.enabled {
             picker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self)
         }
 
diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift
@@ -573,8 +573,7 @@ extension MediaLibraryViewController: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {
-        guard #available(iOS 14.0, *),
-              FeatureFlag.mediaPickerPermissionsNotice.enabled,
+        guard FeatureFlag.mediaPickerPermissionsNotice.enabled,
               picker != self else {
             return false
         }
@@ -584,19 +583,14 @@ extension MediaLibraryViewController: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize {
-        guard #available(iOS 14.0, *) else {
-            return .zero
-        }
-
         let header = DeviceMediaPermissionsHeader()
         header.translatesAutoresizingMaskIntoConstraints = false
 
         return header.referenceSizeInView(picker.view)
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) {
-        guard #available(iOS 14.0, *),
-              let headerView = headerView as? DeviceMediaPermissionsHeader else {
+        guard let headerView = headerView as? DeviceMediaPermissionsHeader else {
             return
         }
 
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift b/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift
@@ -36,9 +36,7 @@ class ReaderTopicsTableCardCell: UITableViewCell {
 
         // iOS 14 puts the contentView in the top of the view hierarchy
         // This conflicts with the tableView interaction, so we disable it
-        if #available(iOS 14, *) {
-            contentView.isUserInteractionEnabled = false
-        }
+        contentView.isUserInteractionEnabled = false
     }
 
     required init?(coder: NSCoder) {
diff --git a/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift b/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift
@@ -148,14 +148,7 @@ class ActionSheetViewController: UIViewController {
     }
 
     private func createButton(_ handler: @escaping () -> Void) -> UIButton {
-        let button: UIButton
-        if #available(iOS 14.0, *) {
-            button = UIButton(type: .custom, primaryAction: UIAction(handler: { _ in handler() }))
-        } else {
-            button = ClosureButton(frame: .zero, closure: {
-                handler()
-            })
-        }
+        let button = UIButton(type: .custom, primaryAction: UIAction(handler: { _ in handler() }))
 
         button.titleLabel?.font = Constants.Button.font
         button.setTitleColor(Constants.Button.textColor, for: .normal)
diff --git a/WordPress/Jetpack/Classes/NUX/New Landing Screen/Views/JetpackPromptView.swift b/WordPress/Jetpack/Classes/NUX/New Landing Screen/Views/JetpackPromptView.swift
@@ -13,11 +13,7 @@ struct JetpackPromptView: View {
     }
 
     private func makeFont() -> Font {
-        if #available(iOS 14.0, *) {
-            return .system(size: Constants.fontSize, weight: .bold).leading(.tight)
-        } else {
-            return .system(size: Constants.fontSize, weight: .bold)
-        }
+        return .system(size: Constants.fontSize, weight: .bold).leading(.tight)
     }
 
     private enum Constants {
diff --git a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
@@ -18,12 +18,7 @@ extension XCTestCase {
         app.activate()
 
         // Media permissions alert handler
-        let alertButtonTitle: String
-        if #available(iOS 14.0, *) {
-            alertButtonTitle = "Allow Access to All Photos"
-        } else {
-            alertButtonTitle = "OK"
-        }
+        let alertButtonTitle = "Allow Access to All Photos"
         systemAlertHandler(alertTitle: "“WordPress” Would Like to Access Your Photos", alertButton: alertButtonTitle)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ class WPMediaPickerForKanvas: WPNavigationMediaPickerViewController, MediaPicker`
`60`	`60`	`photoPicker.dataSource = WPPHAssetDataSource.sharedInstance()`
`61`	`61`	`photoPicker.tabBarItem = UITabBarItem(title: Constants.photosTabBarTitle, image: Constants.photosTabBarIcon, tag: 0)`
`62`	`62`
`63`		`- if #available(iOS 14.0, *),`
`64`		`- FeatureFlag.mediaPickerPermissionsNotice.enabled {`
	`63`	`+ if FeatureFlag.mediaPickerPermissionsNotice.enabled {`
`65`	`64`	`photoPicker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self)`
`66`	`65`	`}`
`67`	`66`
`@@ -182,8 +181,7 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate {`
`182`	`181`	`}`
`183`	`182`
`184`	`183`	`func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {`
`185`		`- guard #available(iOS 14.0, *),`
`186`		`- FeatureFlag.mediaPickerPermissionsNotice.enabled,`
	`184`	`+ guard FeatureFlag.mediaPickerPermissionsNotice.enabled,`
`187`	`185`	`picker.dataSource is WPPHAssetDataSource else {`
`188`	`186`	`return false`
`189`	`187`	`}`
`@@ -192,19 +190,14 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate {`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize {`
`195`		`- guard #available(iOS 14.0, *) else {`
`196`		`- return .zero`
`197`		`- }`
`198`		`-`
`199`	`193`	`let header = DeviceMediaPermissionsHeader()`
`200`	`194`	`header.translatesAutoresizingMaskIntoConstraints = false`
`201`	`195`
`202`	`196`	`return header.referenceSizeInView(picker.view)`
`203`	`197`	`}`
`204`	`198`
`205`	`199`	`func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) {`
`206`		`- guard #available(iOS 14.0, *),`
`207`		`- let headerView = headerView as? DeviceMediaPermissionsHeader else {`
	`200`	`+ guard let headerView = headerView as? DeviceMediaPermissionsHeader else {`
`208`	`201`	`return`
`209`	`202`	`}`
`210`	`203`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,6 @@ extension SitePickerViewController {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func showEmojiPicker() {`
`95`		`- guard #available(iOS 14.0, *) else {`
`96`		`- return`
`97`		`- }`
`98`		`-`
`99`	`95`	`var pickerView = SiteIconPickerView()`
`100`	`96`
`101`	`97`	`pickerView.onCompletion = { [weak self] image in`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,7 @@ extension SitePickerViewController: BlogDetailHeaderViewDelegate {`
`88`	`88`	`showUpdateSiteIconAlert()`
`89`	`89`	`}`
`90`	`90`
`91`		`- if #available(iOS 14.0, *) {`
`92`		`- showSiteIconSelectionAlert()`
`93`		`- } else {`
`94`		`- showUpdateSiteIconAlert()`
`95`		`- }`
	`91`	`+ showSiteIconSelectionAlert()`
`96`	`92`	`}`
`97`	`93`
`98`	`94`	`func siteIconReceivedDroppedImage(_ image: UIImage?) {`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,7 @@ class GutenbergMediaPickerHelper: NSObject {`
`68`	`68`	`picker.delegate = self`
`69`	`69`	`picker.mediaPicker.registerClass(forReusableCellOverlayViews: DisabledVideoOverlay.self)`
`70`	`70`
`71`		`- if #available(iOS 14.0, *),`
`72`		`- FeatureFlag.mediaPickerPermissionsNotice.enabled {`
	`71`	`+ if FeatureFlag.mediaPickerPermissionsNotice.enabled {`
`73`	`72`	`picker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self)`
`74`	`73`	`}`
`75`	`74`
`@@ -137,8 +136,7 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {`
`140`		`- guard #available(iOS 14.0, *),`
`141`		`- FeatureFlag.mediaPickerPermissionsNotice.enabled,`
	`139`	`+ guard FeatureFlag.mediaPickerPermissionsNotice.enabled,`
`142`	`140`	`picker !== cameraPicker else {`
`143`	`141`	`return false`
`144`	`142`	`}`
`@@ -147,19 +145,14 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {`
`147`	`145`	`}`
`148`	`146`
`149`	`147`	`func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize {`
`150`		`- guard #available(iOS 14.0, *) else {`
`151`		`- return .zero`
`152`		`- }`
`153`		`-`
`154`	`148`	`let header = DeviceMediaPermissionsHeader()`
`155`	`149`	`header.translatesAutoresizingMaskIntoConstraints = false`
`156`	`150`
`157`	`151`	`return header.referenceSizeInView(picker.view)`
`158`	`152`	`}`
`159`	`153`
`160`	`154`	`func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) {`
`161`		`- guard #available(iOS 14.0, *),`
`162`		`- let headerView = headerView as? DeviceMediaPermissionsHeader else {`
	`155`	`+ guard let headerView = headerView as? DeviceMediaPermissionsHeader else {`
`163`	`156`	`return`
`164`	`157`	`}`
`165`	`158`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ extension GutenbergViewController {`
`73`	`73`	`ActionDispatcher.dispatch(NoticeAction.unlock)`
`74`	`74`	`}`
`75`	`75`
`76`		`- if #available(iOS 14.0, *),`
`77`		`- let button = navigationBarManager.moreBarButtonItem.customView {`
	`76`	`+ if let button = navigationBarManager.moreBarButtonItem.customView {`
`78`	`77`	`// Required to work around an issue present in iOS 14 beta 2`
`79`	`78`	`// https://github.com/wordpress-mobile/WordPress-iOS/issues/14460`
`80`	`79`	`alert.popoverPresentationController?.sourceRect = button.convert(button.bounds, to: navigationController?.navigationBar)`
Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,7 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega`
`402`	`402`
`403`	`403`	`// Required to work around an issue present in iOS 14 beta 2`
`404`	`404`	`// https://github.com/wordpress-mobile/WordPress-iOS/issues/14460`
`405`		`- if #available(iOS 14.0, *),`
`406`		`- presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {`
	`405`	`+ if presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier {`
`407`	`406`	`dismiss(animated: true)`
`408`	`407`	`}`
`409`	`408`	`}`