From 0ac8f13c0b0a294ccd6906cf489b496d921cd2bd Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 27 Nov 2018 14:36:35 -0700
Subject: [PATCH] remove redunant method, consolidate naming, adding array
 getter

---
 .../AttachmentApprovalViewController.swift    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index 14e73e71c..ad65eacce 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -314,7 +314,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         lastObservedKeyboardTop = keyboardEndFrame.size.height
 
         let keyboardScenario: KeyboardScenario = bottomToolView.isEditingMediaMessage ? .editingMessage : .editingCaption
-        currentPageController.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario)
+        currentPageViewController.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario)
     }
 
     @objc
@@ -337,7 +337,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         Logger.debug("\(keyboardStartFrame) -> \(keyboardEndFrame)")
 
         lastObservedKeyboardTop = UIScreen.main.bounds.height - keyboardEndFrame.size.height
-        currentPageController.updateCaptionViewBottomInset(keyboardScenario: .hidden)
+        currentPageViewController.updateCaptionViewBottomInset(keyboardScenario: .hidden)
     }
 
     // MARK: - View Helpers
@@ -483,13 +483,17 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         return nextPage
     }
 
-    public var currentViewController: AttachmentPrepViewController {
-        return viewControllers!.first as! AttachmentPrepViewController
+    public var currentPageViewController: AttachmentPrepViewController {
+        return pageViewControllers.first!
+    }
+
+    public var pageViewControllers: [AttachmentPrepViewController] {
+        return super.viewControllers!.map { $0 as! AttachmentPrepViewController }
     }
 
     var currentItem: SignalAttachmentItem! {
         get {
-            return currentViewController.attachmentItem
+            return currentPageViewController.attachmentItem
         }
         set {
             setCurrentItem(newValue, direction: .forward, animated: false)
@@ -586,23 +590,19 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
 }
 
 extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate {
-    var currentPageController: AttachmentPrepViewController {
-        return viewControllers!.first as! AttachmentPrepViewController
-    }
-
     func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
-        currentPageController.setAttachmentViewScale(.compact, animated: true)
+        currentPageViewController.setAttachmentViewScale(.compact, animated: true)
     }
 
     func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
-        currentPageController.setAttachmentViewScale(.fullsize, animated: true)
+        currentPageViewController.setAttachmentViewScale(.fullsize, animated: true)
     }
 
     func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
         // Toolbar flickers in and out if there are errors
         // and remains visible momentarily after share extension is dismissed.
         // It's easiest to just hide it at this point since we're done with it.
-        currentViewController.shouldAllowAttachmentViewResizing = false
+        currentPageViewController.shouldAllowAttachmentViewResizing = false
         mediaMessageTextToolbar.isUserInteractionEnabled = false
         mediaMessageTextToolbar.isHidden = true