From 366b228c019b152f5a885c726ad8cda1390a0074 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 9 Nov 2018 09:36:06 -0600
Subject: [PATCH] use UUID for TSInteractions.uniqueId

---
 .../src/Messages/Interactions/TSInteraction.m |  2 +-
 .../Storage/OWSPrimaryStorage+messageIDs.h    | 11 ------
 .../Storage/OWSPrimaryStorage+messageIDs.m    | 34 -------------------
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.h
 delete mode 100644 SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.m

diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index 37434f8ef..7b0d5a93b 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -174,7 +174,7 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
     if (!self.uniqueId) {
         OWSFailDebug(self.uniqueId);
-        self.uniqueId = [OWSPrimaryStorage getAndIncrementMessageIdWithTransaction:transaction];
+        self.uniqueId = [NSUUID new];
     }
 
     [super saveWithTransaction:transaction];
diff --git a/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.h b/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.h
deleted file mode 100644
index a4d7912ce..000000000
--- a/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSPrimaryStorage.h"
-
-@interface OWSPrimaryStorage (messageIDs)
-
-+ (NSString *)getAndIncrementMessageIdWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
-
-@end
diff --git a/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.m b/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.m
deleted file mode 100644
index aa709ce79..000000000
--- a/SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.m
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSPrimaryStorage+messageIDs.h"
-#import <YapDatabase/YapDatabase.h>
-
-#define TSStorageParametersCollection @"TSStorageParametersCollection"
-#define TSMessagesLatestId @"TSMessagesLatestId"
-
-@implementation OWSPrimaryStorage (messageIDs)
-
-+ (NSString *)getAndIncrementMessageIdWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
-{
-    NSString *messageId = [transaction objectForKey:TSMessagesLatestId inCollection:TSStorageParametersCollection];
-    if (!messageId) {
-        messageId = @"0";
-    }
-
-    NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
-    numberFormatter.numberStyle = NSNumberFormatterDecimalStyle;
-    NSNumber *myNumber = [numberFormatter numberFromString:messageId];
-
-    unsigned long long nextMessageId = [myNumber unsignedLongLongValue];
-    nextMessageId++;
-
-    NSString *nextMessageIdString = [[NSNumber numberWithUnsignedLongLong:nextMessageId] stringValue];
-
-    [transaction setObject:nextMessageIdString forKey:TSMessagesLatestId inCollection:TSStorageParametersCollection];
-
-    return messageId;
-}
-
-@end