From 22626bdffd7e363610bdf92577dfeeef56341192 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:35 -0500 Subject: [PATCH] Revert "Temporarily enable image editor." This reverts commit 1078756bc60da4afb146a38e560a7d34234aafdb. --- .../ViewControllers/AttachmentApprovalViewController.swift | 2 ++ SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index a069db499..10fc300cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -782,6 +782,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() + #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -797,6 +798,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD viewController: self) } } + #endif if isZoomable { // Add top and bottom gradients to ensure toolbar controls are legible diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f99ccde46..cd7272096 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return true + return _isDebugAssertConfiguration() } @objc