oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix profile picture handling

This commit is contained in:
Niels Andriesse 2021-05-14 10:55:17 +10:00
parent 31f1a2e827
commit cdf27a631a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SessionMessagingKit/File Server/FileServerAPIV2.swift
View File

@ -74,7 +74,7 @@ public final class FileServerAPIV2 : NSObject {
// MARK: File Storage // MARK: File Storage
@objc(upload:) @objc(upload:)
public static func objc_upload(file: Data) -> AnyPromise { 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<UInt64> { public static func upload(_ file: Data) -> Promise<UInt64> {

4
SignalUtilitiesKit/To Do/OWSProfileManager.m
View File

@ -364,8 +364,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
AnyPromise *promise = [SNFileServerAPIV2 upload:encryptedAvatarData]; AnyPromise *promise = [SNFileServerAPIV2 upload:encryptedAvatarData];
[promise.thenOn(dispatch_get_main_queue(), ^(uint64_t fileID) { [promise.thenOn(dispatch_get_main_queue(), ^(NSString *fileID) {
NSString *downloadURL = [NSString stringWithFormat:@"%@/files/%llu", SNFileServerAPIV2.server, fileID]; NSString *downloadURL = [NSString stringWithFormat:@"%@/files/%@", SNFileServerAPIV2.server, fileID];
[NSUserDefaults.standardUserDefaults setObject:[NSDate new] forKey:@"lastProfilePictureUpload"]; [NSUserDefaults.standardUserDefaults setObject:[NSDate new] forKey:@"lastProfilePictureUpload"];
[self.localUserProfile updateWithProfileKey:newProfileKey dbConnection:self.dbConnection completion:^{ [self.localUserProfile updateWithProfileKey:newProfileKey dbConnection:self.dbConnection completion:^{
successBlock(downloadURL); successBlock(downloadURL);