Fix test not working because of constructor.
This commit is contained in:
parent
177c762a2e
commit
cfb3040b72
|
@ -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() }
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue