From cdf27a631aaf1849137d3636885e5c790d11381a Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 14 May 2021 10:55:17 +1000 Subject: [PATCH] Fix profile picture handling --- SessionMessagingKit/File Server/FileServerAPIV2.swift | 2 +- SignalUtilitiesKit/To Do/OWSProfileManager.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SessionMessagingKit/File Server/FileServerAPIV2.swift b/SessionMessagingKit/File Server/FileServerAPIV2.swift index 0ff9a8f59..dd19b528c 100644 --- a/SessionMessagingKit/File Server/FileServerAPIV2.swift +++ b/SessionMessagingKit/File Server/FileServerAPIV2.swift @@ -74,7 +74,7 @@ public final class FileServerAPIV2 : NSObject { // MARK: File Storage @objc(upload:) public static func objc_upload(file: Data) -> AnyPromise { - return AnyPromise.from(upload(file)) + return AnyPromise.from(upload(file).map { String($0) }) } public static func upload(_ file: Data) -> Promise { diff --git a/SignalUtilitiesKit/To Do/OWSProfileManager.m b/SignalUtilitiesKit/To Do/OWSProfileManager.m index ee29b22b0..c37b850f9 100644 --- a/SignalUtilitiesKit/To Do/OWSProfileManager.m +++ b/SignalUtilitiesKit/To Do/OWSProfileManager.m @@ -364,8 +364,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error); AnyPromise *promise = [SNFileServerAPIV2 upload:encryptedAvatarData]; - [promise.thenOn(dispatch_get_main_queue(), ^(uint64_t fileID) { - NSString *downloadURL = [NSString stringWithFormat:@"%@/files/%llu", SNFileServerAPIV2.server, fileID]; + [promise.thenOn(dispatch_get_main_queue(), ^(NSString *fileID) { + NSString *downloadURL = [NSString stringWithFormat:@"%@/files/%@", SNFileServerAPIV2.server, fileID]; [NSUserDefaults.standardUserDefaults setObject:[NSDate new] forKey:@"lastProfilePictureUpload"]; [self.localUserProfile updateWithProfileKey:newProfileKey dbConnection:self.dbConnection completion:^{ successBlock(downloadURL);