From 03aba93985934f654fe5d4dd02df4e25bd46939d Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Thu, 8 Nov 2018 13:07:01 -0600
Subject: [PATCH] CR: use id for hashvalue, make clearer that we don't expect
 to use incrementing ID's for uniqueId

---
 Signal/src/ViewControllers/MediaGalleryViewController.swift | 2 +-
 SignalServiceKit/src/Messages/Interactions/TSInteraction.m  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift
index ee0b587f4..9bffd3743 100644
--- a/Signal/src/ViewControllers/MediaGalleryViewController.swift
+++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift
@@ -45,7 +45,7 @@ public class MediaGalleryItem: Equatable, Hashable {
     // MARK: Hashable
 
     public var hashValue: Int {
-        return attachmentStream.hashValue
+        return attachmentStream.uniqueId?.hashValue ?? attachmentStream.hashValue
     }
 }
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index ff05ac78a..37434f8ef 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -172,8 +172,8 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 }
 
 - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
-    OWSAssertDebug(self.uniqueId);
     if (!self.uniqueId) {
+        OWSFailDebug(self.uniqueId);
         self.uniqueId = [OWSPrimaryStorage getAndIncrementMessageIdWithTransaction:transaction];
     }