From da13dc1d2ed29cdd4db31e12e2ebc8951739a5b7 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 17 Dec 2018 14:27:26 -0500
Subject: [PATCH] Clean up ahead of PR.

---
 .../AttachmentApprovalViewController.swift                | 2 ++
 SignalMessaging/Views/ImageEditor/ImageEditor.swift       | 6 ++++++
 .../Views/ImageEditor/ImageEditorGestureRecognizer.swift  | 8 ++++----
 SignalMessaging/Views/ImageEditor/ImageEditorView.swift   | 4 ++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index 31ad1af96c..ac78a48e54 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -946,6 +946,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
         containerView.addSubview(mediaMessageView)
         mediaMessageView.autoPinEdgesToSuperviewEdges()
 
+        #if DEBUG
         if let imageEditorModel = attachmentItem.imageEditorModel,
             let imageMediaView = self.mediaMessageView.contentView {
             let imageEditorView = ImageEditorView(model: imageEditorModel)
@@ -954,6 +955,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
             imageEditorView.autoPinEdgesToSuperviewEdges()
             self.imageEditorView = imageEditorView
         }
+        #endif
 
         if isZoomable {
             // Add top and bottom gradients to ensure toolbar controls are legible
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditor.swift b/SignalMessaging/Views/ImageEditor/ImageEditor.swift
index b3af2b838a..9e7af2ec23 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditor.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditor.swift
@@ -145,6 +145,8 @@ public class ImageEditorContents: NSObject {
 
     @objc
     public func append(item: ImageEditorItem) {
+        Logger.verbose("\(item.itemId)")
+
         if itemMap[item.itemId] != nil {
             owsFail("Unexpected duplicate item in item map: \(item.itemId)")
         }
@@ -163,6 +165,8 @@ public class ImageEditorContents: NSObject {
 
     @objc
     public func replace(item: ImageEditorItem) {
+        Logger.verbose("\(item.itemId)")
+
         if itemMap[item.itemId] == nil {
             owsFail("Missing item in item map: \(item.itemId)")
         }
@@ -179,6 +183,8 @@ public class ImageEditorContents: NSObject {
 
     @objc
     public func remove(item: ImageEditorItem) {
+        Logger.verbose("\(item.itemId)")
+
         remove(itemId: item.itemId)
     }
 
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift
index af17310ae0..eefc4717c4 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift
@@ -42,7 +42,7 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer {
 
     @objc
     override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
-        super.touchesBegan(touches, with: event)
+        super.touchesMoved(touches, with: event)
 
         switch state {
         case .began, .changed:
@@ -61,13 +61,13 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer {
 
     @objc
     override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent) {
-        super.touchesBegan(touches, with: event)
+        super.touchesEnded(touches, with: event)
 
         switch state {
         case .began, .changed:
             switch touchType(for: touches, with: event) {
             case .valid, .outside:
-                state = .changed
+                state = .ended
             case .invalid:
                 state = .failed
             }
@@ -78,7 +78,7 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer {
 
     @objc
     override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent) {
-        super.touchesBegan(touches, with: event)
+        super.touchesCancelled(touches, with: event)
 
         state = .failed
     }
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
index 8455f2afb3..f7461a2e18 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
@@ -37,6 +37,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
     public func handleTouchGesture(_ gestureRecognizer: UIGestureRecognizer) {
         AssertIsOnMainThread()
 
+        Logger.verbose("\(NSStringForUIGestureRecognizerState(gestureRecognizer.state))")
+
         let removeCurrentStroke = {
             if let stroke = self.currentStroke {
                 self.model.remove(item: stroke)
@@ -174,6 +176,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
                                           viewSize: CGSize) -> CALayer? {
         AssertIsOnMainThread()
 
+        Logger.verbose("\(item.itemId)")
+
         let strokeWidth = ImageEditorStrokeItem.strokeWidth(forUnitStrokeWidth: item.unitStrokeWidth,
                                                             dstSize: viewSize)
         let unitSamples = item.unitSamples