Respond to CR.

Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme

@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4D5E7522A33906C902399C86F0A95AA5"
+               BlueprintIdentifier = "139191489344C25F7D7E65F88AA821FF"
                BuildableName = "SignalServiceKit.framework"
                BlueprintName = "SignalServiceKit"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -56,7 +56,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AB62203226FE5032747AA668B1E97176"
+               BlueprintIdentifier = "11A6D3ED18260650136E8F509A45FB35"
                BuildableName = "SignalServiceKit-Unit-Tests.xctest"
                BlueprintName = "SignalServiceKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -66,7 +66,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC89BC6B06642C78EABF18B43FFB41DE"
+               BlueprintIdentifier = "1D5FBD12E05B627E46927DBA76985355"
                BuildableName = "SignalCoreKit-Unit-Tests.xctest"
                BlueprintName = "SignalCoreKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -76,7 +76,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E012D804E31EC876E21973F300B46CCB"
+               BlueprintIdentifier = "5B34FB0B5ABA685EF33F1BA1C388F016"
                BuildableName = "AxolotlKit-Unit-Tests.xctest"
                BlueprintName = "AxolotlKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -86,7 +86,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B4A8ABAC14D962F8F42814238460DF44"
+               BlueprintIdentifier = "D85B45003BA81D72F606FDF3EB4B4E1C"
                BuildableName = "Curve25519Kit-Unit-Tests.xctest"
                BlueprintName = "Curve25519Kit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -96,7 +96,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E5C44C64CDE3569B16010274DCD48BCC"
+               BlueprintIdentifier = "F9C2DA0BADF4F69559F0AA5BB4FC1E06"
                BuildableName = "HKDFKit-Unit-Tests.xctest"
                BlueprintName = "HKDFKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -106,7 +106,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "00649589DE58D9DECF419A3CC47D6924"
+               BlueprintIdentifier = "92057C418B970541FF6BE6E64A49D8C2"
                BuildableName = "SignalMetadataKit-Unit-Tests.xctest"
                BlueprintName = "SignalMetadataKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -136,8 +136,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableThreadSanitizer = "YES"
-      enableUBSanitizer = "YES"
+      disableMainThreadChecker = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift

@@ -61,7 +61,7 @@ public class ConversationMediaView: UIView {
             return
         }
         guard !isFailedDownload else {
-            configureForMissingOrInvalid(.failed)
+            configure(forError: .failed)
             return
         }
         if attachmentStream.isAnimated {
@@ -72,28 +72,28 @@ public class ConversationMediaView: UIView {
             configureForVideo(attachmentStream: attachmentStream)
         } else {
             owsFailDebug("Attachment has unexpected type.")
-            configureForMissingOrInvalid(.invalid)
+            configure(forError: .invalid)
         }
     }
 
     private func addDownloadProgressIfNecessary() {
         guard !isFailedDownload else {
-            configureForMissingOrInvalid(.failed)
+            configure(forError: .failed)
             return
         }
         guard let attachmentPointer = attachment as? TSAttachmentPointer else {
             owsFailDebug("Attachment has unexpected type.")
-            configureForMissingOrInvalid(.invalid)
+            configure(forError: .invalid)
             return
         }
         guard let attachmentId = attachmentPointer.uniqueId else {
             owsFailDebug("Attachment missing unique ID.")
-            configureForMissingOrInvalid(.invalid)
+            configure(forError: .invalid)
             return
         }
         guard nil != attachmentDownloads.downloadProgress(forAttachmentId: attachmentId) else {
             // Not being downloaded.
-            configureForMissingOrInvalid(.missing)
+            configure(forError: .missing)
             return
         }
 
@@ -112,7 +112,7 @@ public class ConversationMediaView: UIView {
         }
         guard let attachmentId = attachmentStream.uniqueId else {
             owsFailDebug("Attachment missing unique ID.")
-            configureForMissingOrInvalid(.invalid)
+            configure(forError: .invalid)
             return false
         }
         guard !attachmentStream.isUploaded else {
@@ -282,16 +282,16 @@ public class ConversationMediaView: UIView {
         return attachmentPointer.state == .failed
     }
 
-    private func configureForMissingOrInvalid(_ error: MediaError) {
+    private func configure(forError error: MediaError) {
         backgroundColor = UIColor.ows_gray05
         let icon: UIImage
         switch (error) {
-            case .failed:
-                guard let asset = UIImage(named: "media_retry") else {
-                    owsFailDebug("Missing image")
-                    return
-                }
-                icon = asset
+        case .failed:
+            guard let asset = UIImage(named: "media_retry") else {
+                owsFailDebug("Missing image")
+                return
+            }
+            icon = asset
         case .invalid:
             guard let asset = UIImage(named: "media_invalid") else {
                 owsFailDebug("Missing image")