From 38a7c93967a11ca6ba28fce9bd3e85ee336329c6 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 13 May 2021 16:11:21 +1000
Subject: [PATCH] Fix profile picture handling

---
 SessionMessagingKit/File Server/FileServerAPIV2.swift | 5 +++--
 SignalUtilitiesKit/To Do/OWSProfileManager.m          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SessionMessagingKit/File Server/FileServerAPIV2.swift b/SessionMessagingKit/File Server/FileServerAPIV2.swift
index c7b627b81..0ff9a8f59 100644
--- a/SessionMessagingKit/File Server/FileServerAPIV2.swift	
+++ b/SessionMessagingKit/File Server/FileServerAPIV2.swift	
@@ -88,8 +88,9 @@ public final class FileServerAPIV2 : NSObject {
     }
     
     @objc(download:)
-    public static func objc_download(file: UInt64) -> AnyPromise {
-        return AnyPromise.from(download(file))
+    public static func objc_download(file: String) -> AnyPromise {
+        guard let id = UInt64(file) else { return AnyPromise.from(Promise<Data>(error: Error.invalidURL)) }
+        return AnyPromise.from(download(id))
     }
     
     public static func download(_ file: UInt64) -> Promise<Data> {
diff --git a/SignalUtilitiesKit/To Do/OWSProfileManager.m b/SignalUtilitiesKit/To Do/OWSProfileManager.m
index a451670c3..ee29b22b0 100644
--- a/SignalUtilitiesKit/To Do/OWSProfileManager.m	
+++ b/SignalUtilitiesKit/To Do/OWSProfileManager.m	
@@ -807,7 +807,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
         
         AnyPromise *promise;
         if ([profilePictureURL containsString:SNFileServerAPIV2.server]) {
-            uint64_t *file = (uint64_t)[[profilePictureURL lastPathComponent] intValue];
+            NSString *file = [profilePictureURL lastPathComponent];
             promise = [SNFileServerAPIV2 download:file];
         } else {
             promise = [SNFileServerAPI downloadAttachmentFrom:profilePictureURL];