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

Merge branch 'charlesmchen/removeServerGUID'

Browse source
This commit is contained in:
Matthew Chen 2018-10-05 13:06:09 -04:00
commit a81a89871e
5 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Signal/src/ViewControllers/ColorPickerViewController.swift
View file

@ -391,8 +391,7 @@ private class MockIncomingMessage: TSIncomingMessage {
expiresInSeconds: 0,
quotedMessage: nil,
contactShare: nil,
serverTimestamp: nil,
serverGuid: nil)
serverTimestamp: nil)
}
required init(coder: NSCoder) {

15
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View file

@ -3727,8 +3727,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0
quotedMessage:nil
contactShare:nil
serverTimestamp:nil
serverGuid:nil];
serverTimestamp:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break;
}
@ -3768,8 +3767,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0
quotedMessage:nil
contactShare:nil
serverTimestamp:nil
serverGuid:nil];
serverTimestamp:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break;
}
@ -4231,8 +4229,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0
quotedMessage:nil
contactShare:nil
serverTimestamp:nil
serverGuid:nil];
serverTimestamp:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
}
{
@ -4273,8 +4270,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:60
quotedMessage:nil
contactShare:nil
serverTimestamp:nil
serverGuid:nil];
serverTimestamp:nil];
// private setter to avoid starting expire machinery.
message.read = YES;
[message save];
@ -4596,8 +4592,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0
quotedMessage:quotedMessage
contactShare:nil
serverTimestamp:nil
serverGuid:nil];
serverTimestamp:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
return message;
}

4
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
View file

@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
@interface TSIncomingMessage : TSMessage <OWSReadTracking>
@property (nonatomic, readonly, nullable) NSNumber *serverTimestamp;
@property (nonatomic, readonly, nullable) NSString *serverGuid;
- (instancetype)initMessageWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
@ -55,8 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:(uint32_t)expiresInSeconds
quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare
serverTimestamp:(nullable NSNumber *)serverTimestamp
serverGuid:(nullable NSString *)serverGuid NS_DESIGNATED_INITIALIZER;
serverTimestamp:(nullable NSNumber *)serverTimestamp NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

3
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
View file

@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, getter=wasRead) BOOL read;
@property (nonatomic, nullable) NSNumber *serverTimestamp;
@property (nonatomic, nullable) NSString *serverGuid;
@end
@ -49,7 +48,6 @@ NS_ASSUME_NONNULL_BEGIN
quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare
serverTimestamp:(nullable NSNumber *)serverTimestamp
serverGuid:(nullable NSString *)serverGuid
{
self = [super initMessageWithTimestamp:timestamp
inThread:thread
@ -68,7 +66,6 @@ NS_ASSUME_NONNULL_BEGIN
_sourceDeviceId = sourceDeviceId;
_read = NO;
_serverTimestamp = serverTimestamp;
_serverGuid = serverGuid;
return self;
}

7
SignalServiceKit/src/Messages/OWSMessageManager.m
View file

@ -1115,7 +1115,6 @@ NS_ASSUME_NONNULL_BEGIN
NSData *groupId = dataMessage.group ? dataMessage.group.id : nil;
OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction];
NSNumber *_Nullable serverTimestamp = (envelope.hasServerTimestamp ? @(envelope.serverTimestamp) : nil);
NSString *_Nullable serverGuid = (envelope.hasServerGuid ? envelope.serverGuid : nil);
if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) {
[self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction];
@ -1230,8 +1229,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage
contactShare:contact
serverTimestamp:serverTimestamp
serverGuid:serverGuid];
serverTimestamp:serverTimestamp];
[self finalizeIncomingMessage:incomingMessage
thread:oldGroupThread
@ -1271,8 +1269,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage
contactShare:contact
serverTimestamp:serverTimestamp
serverGuid:serverGuid];
serverTimestamp:serverTimestamp];
[self finalizeIncomingMessage:incomingMessage
thread:thread