wordpress-mobile · Nov 7, 2018 · Nov 7, 2018
diff --git a/WordPress/Classes/Extensions/UIAlertController+Helpers.swift b/WordPress/Classes/Extensions/UIAlertController+Helpers.swift
@@ -16,7 +16,7 @@ import WordPressFlux
         while leafViewController.presentedViewController != nil && !leafViewController.presentedViewController!.isBeingDismissed {
             leafViewController = leafViewController.presentedViewController!
         }
-        leafViewController.present(self, animated: true, completion: nil)
+        leafViewController.present(self, animated: true)
     }
 }
 

diff --git a/WordPress/Classes/System/3DTouch/WP3DTouchShortcutHandler.swift b/WordPress/Classes/System/3DTouch/WP3DTouchShortcutHandler.swift
@@ -56,6 +56,6 @@ open class WP3DTouchShortcutHandler: NSObject {
     }
 
     fileprivate func clearCurrentViewController() {
-        WordPressAppDelegate.sharedInstance().window!.rootViewController?.dismiss(animated: false, completion: nil)
+        WordPressAppDelegate.sharedInstance().window!.rootViewController?.dismiss(animated: false)
     }
 }
diff --git a/WordPress/Classes/Utility/ContentCoordinator.swift b/WordPress/Classes/Utility/ContentCoordinator.swift
@@ -91,14 +91,14 @@ struct DefaultContentCoordinator: ContentCoordinator {
 
         let webViewController = WebViewControllerFactory.controllerAuthenticatedWithDefaultAccount(url: url)
         let navController = UINavigationController(rootViewController: webViewController)
-        controller?.present(navController, animated: true, completion: nil)
+        controller?.present(navController, animated: true)
     }
 
     func displayFullscreenImage(_ image: UIImage) {
         let imageViewController = WPImageViewController(image: image)
         imageViewController.modalTransitionStyle = .crossDissolve
         imageViewController.modalPresentationStyle = .fullScreen
-        controller?.present(imageViewController, animated: true, completion: nil)
+        controller?.present(imageViewController, animated: true)
     }
 
     func displayPlugin(withSlug pluginSlug: String, on siteSlug: String) throws {

diff --git a/WordPress/Classes/Utility/ImmuTableViewController.swift b/WordPress/Classes/Utility/ImmuTableViewController.swift
@@ -21,7 +21,7 @@ extension ImmuTablePresenter where Self: UIViewController {
         return {
             [unowned self] in
             let controller = controllerGenerator($0)
-            self.present(controller, animated: true, completion: nil)
+            self.present(controller, animated: true)
         }
     }
 }

diff --git a/WordPress/Classes/Utility/Spotlight/SearchManager.swift b/WordPress/Classes/Utility/Spotlight/SearchManager.swift
@@ -433,7 +433,7 @@ fileprivate extension SearchManager {
         openListView(for: post)
         let editor = EditPostViewController.init(post: post)
         editor.modalPresentationStyle = .fullScreen
-        WPTabBarController.sharedInstance().present(editor, animated: true, completion: nil)
+        WPTabBarController.sharedInstance().present(editor, animated: true)
     }
 
     func openEditor(for page: Page) {
@@ -442,14 +442,14 @@ fileprivate extension SearchManager {
         let editorSettings = EditorSettings()
         let postViewController = editorSettings.instantiatePageEditor(page: page) { (editor, vc) in
             editor.onClose = { changesSaved, _ in
-                vc.dismiss(animated: true, completion: nil)
+                vc.dismiss(animated: true)
             }
         }
 
         let navController = UINavigationController(rootViewController: postViewController)
         navController.restorationIdentifier = Restorer.Identifier.navigationController.rawValue
         navController.modalPresentationStyle = .fullScreen
-        WPTabBarController.sharedInstance().present(navController, animated: true, completion: nil)
+        WPTabBarController.sharedInstance().present(navController, animated: true)
     }
 
     func openPreview(for apost: AbstractPost) {
@@ -461,7 +461,7 @@ fileprivate extension SearchManager {
         controller.onClose = {
             navWrapper.dismiss(animated: true) {}
         }
-        WPTabBarController.sharedInstance().present(navWrapper, animated: true, completion: nil)
+        WPTabBarController.sharedInstance().present(navWrapper, animated: true)
         openListView(for: apost)
     }
 
@@ -475,7 +475,7 @@ fileprivate extension SearchManager {
                 // Do nothing — post is already loaded or PostPreviewViewController isn't visible
                 return
         }
-        navController.dismiss(animated: true, completion: nil)
+        navController.dismiss(animated: true)
     }
 
     /// If there is any PostPreviewViewController window open, close it.
@@ -485,6 +485,6 @@ fileprivate extension SearchManager {
             let _ = navController.topViewController as? PostPreviewViewController else {
                 return
         }
-        navController.dismiss(animated: true, completion: nil)
+        navController.dismiss(animated: true)
     }
 }
diff --git a/WordPress/Classes/Utility/WebKitViewController.swift b/WordPress/Classes/Utility/WebKitViewController.swift
@@ -124,7 +124,7 @@ class WebKitViewController: UIViewController {
 
     @objc func loadWebViewRequest() {
         if ReachabilityUtils.alertIsShowing() {
-            self.dismiss(animated: false, completion: nil)
+            self.dismiss(animated: false)
         }
 
         guard let authenticator = authenticator,
@@ -294,7 +294,7 @@ class WebKitViewController: UIViewController {
     // MARK: User Actions
 
     @objc func close() {
-        dismiss(animated: true, completion: nil)
+        dismiss(animated: true)
     }
 
     @objc func share() {
@@ -311,7 +311,7 @@ class WebKitViewController: UIViewController {
                 WPActivityDefaults.trackActivityType(type)
             }
         }
-        present(activityViewController, animated: true, completion: nil)
+        present(activityViewController, animated: true)
 
     }
 
@@ -393,13 +393,13 @@ extension WebKitViewController: WKUIDelegate {
             let url = navigationAction.request.url {
             let controller = WebKitViewController(url: url, parent: self)
             let navController = UINavigationController(rootViewController: controller)
-            present(navController, animated: true, completion: nil)
+            present(navController, animated: true)
         }
         return nil
     }
 
     func webViewDidClose(_ webView: WKWebView) {
-        dismiss(animated: true, completion: nil)
+        dismiss(animated: true)
     }
 
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {

diff --git a/WordPress/Classes/Utility/ZendeskUtils.swift b/WordPress/Classes/Utility/ZendeskUtils.swift
@@ -744,7 +744,7 @@ private extension ZendeskUtils {
         }
 
         // Show alert
-        presentInController?.present(alertController, animated: true, completion: nil)
+        presentInController?.present(alertController, animated: true)
     }
 
     @objc static func emailTextFieldDidChange(_ textField: UITextField) {

diff --git a/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift b/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift
@@ -215,7 +215,7 @@ extension ActivityListViewController: ActivityRewindPresenter {
                                                       handler: { action in
                                                         self.restoreSiteToRewindID(rewindID)
                                                       })
-        self.present(alertController, animated: true, completion: nil)
+        self.present(alertController, animated: true)
     }
 
 }

diff --git a/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift b/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift
@@ -83,7 +83,7 @@ class AztecVerificationPromptHelper: NSObject {
                                                         return
                                             }
 
-                                            displayedAlert.dismiss(animated: true, completion: nil)
+                                            displayedAlert.dismiss(animated: true)
                                             self?.completionBlock?(!updatedAccount.needsEmailVerification)
             }, failure: nil)
     }

diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecAttachmentViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecAttachmentViewController.swift
@@ -225,13 +225,13 @@ class AztecAttachmentViewController: UITableViewController {
 
     @objc func handleCancelButtonTapped(sender: UIBarButtonItem) {
         onCancel?()
-        dismiss(animated: true, completion: nil)
+        dismiss(animated: true)
     }
 
     @objc func handleDoneButtonTapped(sender: UIBarButtonItem) {
         let checkedAlt = alt == "" ? nil : alt
         onUpdate?(alignment, size, linkURL, checkedAlt, caption)
-        dismiss(animated: true, completion: nil)
+        dismiss(animated: true)
     }
 
     private func pushSettingsController(for row: EditableTextRow,

diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
@@ -1203,7 +1203,7 @@ extension AztecPostViewController {
         }
 
         alertController.popoverPresentationController?.barButtonItem = closeBarButtonItem
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
     }
 
     private func publishPost(
@@ -1280,7 +1280,7 @@ extension AztecPostViewController {
             let controller = FancyAlertViewController.makeAsyncPostingAlertController(action: action, isPage: isPage, onConfirm: publishBlock)
             controller.modalPresentationStyle = .custom
             controller.transitioningDelegate = self
-            self.present(controller, animated: true, completion: nil)
+            self.present(controller, animated: true)
         }
 
         if action.isAsync {
@@ -1297,7 +1297,7 @@ extension AztecPostViewController {
     func displayMediaIsUploadingAlert() {
         let alertController = UIAlertController(title: MediaUploadingAlert.title, message: MediaUploadingAlert.message, preferredStyle: .alert)
         alertController.addDefaultActionWithTitle(MediaUploadingAlert.acceptTitle)
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
     }
 
     @IBAction func closeWasPressed() {
@@ -1354,7 +1354,7 @@ private extension AztecPostViewController {
 
         // Setup Handlers
         let successHandler: BlogSelectorSuccessHandler = { selectedObjectID in
-            self.dismiss(animated: true, completion: nil)
+            self.dismiss(animated: true)
 
             guard let blog = self.mainContext.object(with: selectedObjectID) as? Blog else {
                 return
@@ -1364,7 +1364,7 @@ private extension AztecPostViewController {
         }
 
         let dismissHandler: BlogSelectorDismissHandler = {
-            self.dismiss(animated: true, completion: nil)
+            self.dismiss(animated: true)
         }
 
         // Setup Picker
@@ -1384,7 +1384,7 @@ private extension AztecPostViewController {
         navigationController.configurePopoverPresentationStyle(from: sourceView)
 
         // Done!
-        present(navigationController, animated: true, completion: nil)
+        present(navigationController, animated: true)
     }
 
     /// Presents an alert controller, allowing the user to insert a link to either:
@@ -1522,7 +1522,7 @@ private extension AztecPostViewController {
 
         alert.addCancelActionWithTitle(SwitchSiteAlert.cancelTitle)
 
-        present(alert, animated: true, completion: nil)
+        present(alert, animated: true)
     }
 
     func displayPostSettings() {
@@ -1555,7 +1555,7 @@ private extension AztecPostViewController {
         }
 
         alertController.addCancelActionWithTitle(FailedMediaRemovalAlert.cancelTitle)
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
     }
 
     @IBAction func displayCancelMediaUploads() {
@@ -1564,7 +1564,7 @@ private extension AztecPostViewController {
             self.mediaCoordinator.cancelUploadOfAllMedia(for: self.post)
         }
         alertController.addCancelActionWithTitle(MediaUploadingCancelAlert.cancelTitle)
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
         return
     }
 
@@ -1585,7 +1585,7 @@ private extension AztecPostViewController {
         alertController.addDefaultActionWithTitle(publishTitle) { _ in
             publishAction()
         }
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
     }
 }
 
@@ -2398,7 +2398,7 @@ extension AztecPostViewController {
     private func dismissOptionsViewController() {
         switch UIDevice.current.userInterfaceIdiom {
         case .pad:
-            dismiss(animated: true, completion: nil)
+            dismiss(animated: true)
         default:
             optionsViewController?.removeFromParent()
             changeRichTextInputView(to: nil)
@@ -2624,11 +2624,11 @@ private extension AztecPostViewController {
             self?.richTextView.edit(attachment) { htmlAttachment in
                 htmlAttachment.rawHTML = html
             }
-            self?.dismiss(animated: true, completion: nil)
+            self?.dismiss(animated: true)
         }
 
         targetVC.onDidCancel = { [weak self] in
-            self?.dismiss(animated: true, completion: nil)
+            self?.dismiss(animated: true)
         }
 
         let navigationController = UINavigationController(rootViewController: targetVC)
@@ -2643,7 +2643,7 @@ private extension AztecPostViewController {
         presentationController?.sourceView = view
         presentationController?.delegate = self
 
-        present(viewController, animated: true, completion: nil)
+        present(viewController, animated: true)
     }
 }
 
@@ -2742,7 +2742,7 @@ private extension AztecPostViewController {
         if let onClose = onClose {
             onClose(didSave, shouldShowPostEpilogue)
         } else if isModal() {
-            presentingViewController?.dismiss(animated: true, completion: nil)
+            presentingViewController?.dismiss(animated: true)
         } else {
             _ = navigationController?.popViewController(animated: true)
         }
@@ -3486,7 +3486,7 @@ extension AztecPostViewController {
 
         let navController = UINavigationController(rootViewController: controller)
         navController.modalPresentationStyle = .formSheet
-        present(navController, animated: true, completion: nil)
+        present(navController, animated: true)
 
         WPAppAnalytics.track(.editorEditedImage, withProperties: [WPAppAnalyticsKeyEditorSource: Analytics.editorSource], with: post)
     }
@@ -3529,13 +3529,13 @@ extension AztecPostViewController {
         controller.showsPlaybackControls = true
         controller.player = player
         player.play()
-        present(controller, animated: true, completion: nil)
+        present(controller, animated: true)
     }
 
     func displayUnableToPlayVideoAlert() {
         let alertController = UIAlertController(title: MediaUnableToPlayVideoAlert.title, message: MediaUnableToPlayVideoAlert.message, preferredStyle: .alert)
         alertController.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Default action"), style: .`default`, handler: nil))
-        present(alertController, animated: true, completion: nil)
+        present(alertController, animated: true)
         return
     }
 
@@ -3791,15 +3791,15 @@ extension AztecPostViewController: WPMediaPickerViewControllerDelegate {
         if picker != mediaPickerInputViewController?.mediaPicker {
             unregisterChangeObserver()
             mediaLibraryDataSource.searchCancelled()
-            dismiss(animated: true, completion: nil)
+            dismiss(animated: true)
         }
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, didFinishPicking assets: [WPMediaAsset]) {
         if picker != mediaPickerInputViewController?.mediaPicker {
             unregisterChangeObserver()
             mediaLibraryDataSource.searchCancelled()
-            dismiss(animated: true, completion: nil)
+            dismiss(animated: true)
             mediaSelectionMethod = .fullScreenPicker
         } else {
             mediaSelectionMethod = .inlinePicker

diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController+FancyAlerts.swift b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController+FancyAlerts.swift
@@ -77,12 +77,12 @@ extension BlogDetailsViewController {
 
             let alert = FancyAlertViewController.makeNotificationPrimerAlertController { (controller) in
                 InteractiveNotificationsManager.shared.requestAuthorization {
-                    controller.dismiss(animated: true, completion: nil)
+                    controller.dismiss(animated: true)
                 }
             }
             alert.modalPresentationStyle = .custom
             alert.transitioningDelegate = self
-            self?.tabBarController?.present(alert, animated: true, completion: nil)
+            self?.tabBarController?.present(alert, animated: true)
         }
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Blog/BlogListViewController+SiteCreation.swift b/WordPress/Classes/ViewRelated/Blog/BlogListViewController+SiteCreation.swift
@@ -3,6 +3,6 @@ extension BlogListViewController {
     func enhancedSiteCreation() {
         let wizardLauncher = SiteCreationWizardLauncher()
         let wizard = wizardLauncher.ui
-        present(wizard, animated: true, completion: nil)
+        present(wizard, animated: true)
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Blog/DateAndTimeFormatSettingsViewController.swift b/WordPress/Classes/ViewRelated/Blog/DateAndTimeFormatSettingsViewController.swift
@@ -206,7 +206,7 @@ open class DateAndTimeFormatSettingsViewController: UITableViewController {
             navigationController?.pushViewController(webViewController, animated: true)
         } else {
             let navController = UINavigationController(rootViewController: webViewController)
-            present(navController, animated: true, completion: nil)
+            present(navController, animated: true)
         }
     }