From 7644755d088bb3c4f3a946dc7bfa1ed6bb0d095b Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 17 Oct 2019 15:16:54 +1100
Subject: [PATCH] Clean

---
 SignalMessaging/profiles/OWSProfileManager.m | 38 ++++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index 5893f4ec3..369e9b551 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -396,6 +396,21 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
     OWSAssertDebug(failureBlock);
     OWSAssertDebug(avatarData == nil || avatarData.length > 0);
 
+    [[LKStorageAPI setProfilePicture:avatarData]
+    .thenOn(dispatch_get_main_queue(), ^(NSString *url) {
+        successBlock(url);
+    })
+    .catchOn(dispatch_get_main_queue(), ^(id result) {
+        // There appears to be a bug in PromiseKit that sometimes causes catchOn
+        // to be invoked with the fulfilled promise's value as the error. The below
+        // is a quick and dirty workaround.
+        if ([result isKindOfClass:NSString.class]) {
+            successBlock(result);
+        } else {
+            failureBlock(result);
+        }
+    }) retainUntilComplete];
+    
     /*
     // We want to clear the local user's profile avatar as soon as
     // we request the upload form, since that request clears our
@@ -407,26 +422,9 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
         OWSUserProfile *userProfile = self.localUserProfile;
         [userProfile updateWithAvatarUrlPath:nil avatarFileName:nil dbConnection:self.dbConnection completion:nil];
     };
-     */
 
-//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        
-        [[LKStorageAPI setProfilePicture:avatarData]
-        .thenOn(dispatch_get_main_queue(), ^(NSString *url) {
-            successBlock(url);
-        })
-        .catchOn(dispatch_get_main_queue(), ^(id result) {
-            // There appears to be a bug in PromiseKit that sometimes causes catchOn
-            // to be invoked with the fulfilled promise's value as the error. The below
-            // is a quick and dirty workaround.
-            if ([result isKindOfClass:NSString.class]) {
-                successBlock(result);
-            } else {
-                failureBlock(result);
-            }
-        }) retainUntilComplete];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
-        /*
         // See: https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-UsingHTTPPOST.html
         TSRequest *formRequest = [OWSRequestFactory profileAvatarUploadFormRequest];
 
@@ -539,8 +537,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
                 OWSLogError(@"Failed to get profile avatar upload form: %@", error);
                 return failureBlock(error);
             }];
-         */
-//    });
+    });
+     */
 }
 
 - (void)updateServiceWithProfileName:(nullable NSString *)localProfileName