Change HTTP alerting in SDLURLSession to use NSURLComponents

Fixes #432

1 files changed, 8 insertions, 7 deletions

diff --git a/SmartDeviceLink/SDLURLSession.m b/SmartDeviceLink/SDLURLSession.m
index 3e2ad6e1c..5e70a7bc1 100644
--- a/SmartDeviceLink/SDLURLSession.m
+++ b/SmartDeviceLink/SDLURLSession.m
@@ -63,11 +63,12 @@ static float DefaultConnectionTimeout = 45.0;
 
 - (void)dataFromURL:(NSURL *)url completionHandler:(SDLURLConnectionRequestCompletionHandler)completionHandler {
     // Apple no longer allows HTTP URLs without a special exception as of Jan. 2017
-    if ([url.scheme isEqualToString:@"http"]) {
-        url = [NSURL URLWithString:[url.absoluteString stringByReplacingOccurrencesOfString:@"http" withString:@"https"]];
+    NSURLComponents *urlComponents = [NSURLComponents componentsWithString:url.absoluteString];
+    if ([urlComponents.scheme isEqualToString:@"http"]) {
+        urlComponents.scheme = @"https";
     }
 
-    NSURLRequest *request = [NSURLRequest requestWithURL:url cachePolicy:self.cachePolicy timeoutInterval:self.connectionTimeout];
+    NSURLRequest *request = [NSURLRequest requestWithURL:urlComponents.URL cachePolicy:self.cachePolicy timeoutInterval:self.connectionTimeout];
 
     SDLURLRequestTask *task = [[SDLURLRequestTask alloc] initWithURLRequest:request completionHandler:completionHandler];
     task.delegate = self;
@@ -76,13 +77,13 @@ static float DefaultConnectionTimeout = 45.0;
 }
 
 - (void)uploadWithURLRequest:(NSURLRequest *)request data:(NSData *)data completionHandler:(SDLURLConnectionRequestCompletionHandler)completionHandler {
-    NSURL *newURL = nil;
-    if ([request.URL.scheme isEqualToString:@"http"]) {
-        newURL = [NSURL URLWithString:[request.URL.absoluteString stringByReplacingOccurrencesOfString:@"http" withString:@"https"]];
+    NSURLComponents *urlComponents = [NSURLComponents componentsWithString:request.URL.absoluteString];
+    if ([urlComponents.scheme isEqualToString:@"http"]) {
+        urlComponents.scheme = @"https";
     }
 
     NSMutableURLRequest *mutableRequest = [request mutableCopy];
-    mutableRequest.URL = newURL;
+    mutableRequest.URL = urlComponents.URL;
     mutableRequest.HTTPBody = data;
     mutableRequest.HTTPMethod = @"POST";