oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

use UUID for TSInteractions.uniqueId

Browse source
This commit is contained in:
Michael Kirk 2018-11-09 09:36:06 -06:00 committed by Matthew Chen
parent 65cef9f980
commit 366b228c01
3 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SignalServiceKit/src/Messages/Interactions/TSInteraction.m
View file

@ -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];

11
SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.h
View file

@ -1,11 +0,0 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSPrimaryStorage.h"
@interface OWSPrimaryStorage (messageIDs)
+ (NSString *)getAndIncrementMessageIdWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
@end

34
SignalServiceKit/src/Storage/OWSPrimaryStorage+messageIDs.m
View file

@ -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