Replace server sent avatar URL with hardcoded

// FREEBIE

Signal/src/Profiles/OWSProfileManager.m

@@ -445,12 +445,6 @@ static const NSInteger kProfileKeyLength = 16;
                 NSDictionary *responseMap = formResponseObject;
                 DDLogError(@"responseObject: %@", formResponseObject);
 
-                NSString *formUrl = responseMap[@"url"];
-                if (![formUrl isKindOfClass:[NSString class]] || formUrl.length < 1) {
-                    OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_url");
-                    failureBlock();
-                    return;
-                }
                 NSString *formAcl = responseMap[@"acl"];
                 if (![formAcl isKindOfClass:[NSString class]] || formAcl.length < 1) {
                     OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_acl");
@@ -495,11 +489,8 @@ static const NSInteger kProfileKeyLength = 16;
                 }
 
                 AFHTTPSessionManager *profileHttpManager =
-                    [[OWSSignalService sharedInstance] profileUploadingSessionManagerWithHostname:formUrl];
-
-                // Default acceptable content headers are rejected by AWS
-                profileHttpManager.responseSerializer.acceptableContentTypes = nil;
-
+                    [[OWSSignalService sharedInstance] cdnSessionManager];
+                
                 [profileHttpManager POST:@""
                     parameters:nil
                     constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {

SignalServiceKit/src/Network/OWSSignalService.h

@@ -12,9 +12,11 @@ extern NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidCha
 
 @interface OWSSignalService : NSObject
 
+/// For interacting with the Signal Service
 @property (nonatomic, readonly) AFHTTPSessionManager *signalServiceSessionManager;
 
-- (AFHTTPSessionManager *)profileUploadingSessionManagerWithHostname:(NSString *)hostname;
+/// For uploading avatar assets.
+@property (nonatomic, readonly) AFHTTPSessionManager *cdnSessionManager;
 
 @property (atomic, readonly) BOOL isCensorshipCircumventionActive;
 

SignalServiceKit/src/Network/OWSSignalService.m

@@ -208,19 +208,23 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
 
 #pragma mark - Profile Uploading
 
-- (AFHTTPSessionManager *)profileUploadingSessionManagerWithHostname:(NSString *)hostname
+- (AFHTTPSessionManager *)cdnSessionManager
 {
-    OWSAssert(hostname.length > 0);
     if (self.isCensorshipCircumventionActive) {
         DDLogInfo(@"%@ Profile uploading may not work when under censorship.", self.tag);
     }
 
-    NSURL *baseURL = [[NSURL alloc] initWithString:[@"https://" stringByAppendingString:hostname]];
+    NSURL *baseURL = [[NSURL alloc] initWithString:textSecureCDNServerURL];
+    OWSAssert(baseURL);
+    
     NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
     AFHTTPSessionManager *sessionManager =
         [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf];
 
     sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy];
+    
+    // Default acceptable content headers are rejected by AWS
+    sessionManager.responseSerializer.acceptableContentTypes = nil;
 
     return sessionManager;
 }

SignalServiceKit/src/TSConstants.h

@@ -22,13 +22,13 @@ typedef enum { kSMSVerification, kPhoneNumberVerification } VerificationTranspor
 
 #define textSecureHTTPTimeOut 10
 
-#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
-#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
-#define textSecureProfileServerURL @"https://profiles.signal.org"
+//#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
+//#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
+//#define textSecureCDNServerURL @"https://cdn.signal.org"
 
-//#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
-//#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
-//#define textSecureProfileServerURL @"https://profiles-staging.signal.org"
+#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
+#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
+#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
 
 #define textSecureGeneralAPI @"v1"
 #define textSecureAccountsAPI @"v1/accounts"