From c60f4cda0d5636191eafac5535016569b788d891 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 28 May 2019 11:47:46 +1000 Subject: [PATCH] Include sender display name in messages --- SignalServiceKit/src/Loki/API/LokiAPI.swift | 2 +- .../src/Messages/Interactions/TSOutgoingMessage.m | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Loki/API/LokiAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI.swift index f875e03ac..60cfd762d 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiAPI.swift @@ -31,7 +31,7 @@ import PromiseKit override private init() { } // MARK: Internal API - internal static func invoke(_ method: Target.Method, on target: Target, associatedWith hexEncodedPublicKey: String, parameters: [String:Any] = [:]) -> Promise { + internal static func invoke(_ method: Target.Method, on target: Target, associatedWith hexEncodedPublicKey: String, parameters: [String:Any] = [:]) -> RawResponsePromise { let url = URL(string: "\(target.address):\(target.port)/\(version)/storage_rpc")! let request = TSRequest(url: url, method: "POST", parameters: [ "method" : method.rawValue, "params" : parameters ]) return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject } diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 28804965d..0b22edee9 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -1102,6 +1102,14 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt [ProtoUtils addLocalProfileKeyIfNecessary:self.thread recipientId:recipientId dataMessageBuilder:builder]; + SSKProtoDataMessageContactBuilder *profileBuilder = [SSKProtoDataMessageContact builder]; + SSKProtoDataMessageContactNameBuilder *nameBuilder = [SSKProtoDataMessageContactName builder]; + [nameBuilder setDisplayName:@"Test"]; // TODO: Use actual name + SSKProtoDataMessageContactName *name = [nameBuilder buildIgnoringErrors]; + [profileBuilder setName:name]; + SSKProtoDataMessageContact *profile = [profileBuilder buildIgnoringErrors]; + [builder setProfile:profile]; + NSError *error; SSKProtoDataMessage *_Nullable dataProto = [builder buildAndReturnError:&error]; if (error || !dataProto) {