From cfb3040b7258b974a1893d2ccf9921e31035b8cd Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 5 May 2020 13:32:08 +1000 Subject: [PATCH] Fix test not working because of constructor. --- .../FriendRequestProtocolTests.swift | 4 ++-- .../Friend Requests/LKFriendRequestMessage.h | 4 ++++ .../Friend Requests/LKFriendRequestMessage.m | 15 +++++++++++++++ .../Multi Device/MultiDeviceProtocol.swift | 5 +---- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift b/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift index 13bdd4500..e28e7d7ec 100644 --- a/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift +++ b/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift @@ -600,8 +600,8 @@ class FriendRequestProtocolTests : XCTestCase { let thread = LokiTestUtilities.createContactThread(for: LokiTestUtilities.generateHexEncodedPublicKey()) let message = TSOutgoingMessage(in: thread, messageBody: nil, attachmentId: nil) - let friendRequest = FriendRequestMessage(in: thread, messageBody: "message", attachmentId: nil) - let sessionRequest = SessionRequestMessage(in: thread, messageBody: nil, attachmentId: nil) + let friendRequest = FriendRequestMessage(outgoingMessageWithTimestamp: 1, in: thread, messageBody: "") + let sessionRequest = SessionRequestMessage(thread: thread) guard let deviceLinkRequest = DeviceLinkMessage(in: thread, masterHexEncodedPublicKey: "", slaveHexEncodedPublicKey: "", masterSignature: nil, slaveSignature: Data(capacity: 0)), let deviceLinkAuthorisation = DeviceLinkMessage(in: thread, masterHexEncodedPublicKey: "", slaveHexEncodedPublicKey: "", masterSignature: Data(capacity: 0), slaveSignature: Data(capacity: 0)) else { return XCTFail() } diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.h b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.h index 3482d4c4e..36c70cfac 100644 --- a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.h +++ b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.h @@ -4,4 +4,8 @@ NS_SWIFT_NAME(FriendRequestMessage) @interface LKFriendRequestMessage : TSOutgoingMessage +- (_Nonnull instancetype)initOutgoingMessageWithTimestamp:(uint64_t)timestamp + inThread:(nullable TSThread *)thread + messageBody:(nullable NSString *)body; + @end diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m index d4030e353..97d8b65b5 100644 --- a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m @@ -8,6 +8,21 @@ @implementation LKFriendRequestMessage +- (instancetype)initOutgoingMessageWithTimestamp:(uint64_t)timestamp + inThread:(nullable TSThread *)thread + messageBody:(nullable NSString *)body { + return [self initOutgoingMessageWithTimestamp:timestamp + inThread:thread + messageBody:body + attachmentIds:@[] + expiresInSeconds:0 expireStartedAt:0 + isVoiceMessage:false + groupMetaMessage:TSGroupMetaMessageUnspecified + quotedMessage:nil + contactShare:nil + linkPreview:nil]; +} + #pragma mark Building - (SSKProtoContentBuilder *)prepareCustomContentBuilder:(SignalRecipient *)recipient { SSKProtoContentBuilder *contentBuilder = SSKProtoContent.builder; diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift index 5a2db292f..ac41dcd0c 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift @@ -151,10 +151,7 @@ public final class MultiDeviceProtocol : NSObject { @objc(getAutoGeneratedMultiDeviceFRMessageForHexEncodedPublicKey:in:) public static func getAutoGeneratedMultiDeviceFRMessage(for hexEncodedPublicKey: String, in transaction: YapDatabaseReadWriteTransaction) -> FriendRequestMessage { let thread = TSContactThread.getOrCreateThread(withContactId: hexEncodedPublicKey, transaction: transaction) - let result = FriendRequestMessage(outgoingMessageWithTimestamp: NSDate.ows_millisecondTimeStamp(), in: thread, - messageBody: "Please accept to enable messages to be synced across devices", - attachmentIds: [], expiresInSeconds: 0, expireStartedAt: 0, isVoiceMessage: false, - groupMetaMessage: .unspecified, quotedMessage: nil, contactShare: nil, linkPreview: nil) + let result = FriendRequestMessage(outgoingMessageWithTimestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageBody: "Please accept to enable messages to be synced across devices") result.skipSave = true // TODO: Why is this necessary again? return result }