Update HTTPs replacement in URLs

3 files changed, 6 insertions, 6 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 8ca9e6283..b94ad3f79 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -4308,7 +4308,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 								byte[] file = FileUtls.downloadFile(urlHttps);

 								if (file != null) {

 									SystemRequest systemRequest = new SystemRequest();

-									systemRequest.setFileName(urlHttps);

+									systemRequest.setFileName(msg.getUrl());

 									systemRequest.setBulkData(file);

 									systemRequest.setRequestType(RequestType.ICON_URL);

 									try {

diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java
index 9370d0218..f8d59261a 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java
@@ -92,7 +92,7 @@ class PoliciesFetcher {
         }
 
         try {
-            url = new URL(sURLString.replaceFirst("http://", "https://"));
+            url = new URL(sURLString);
             urlConnection = (HttpURLConnection) url.openConnection();
             urlConnection.setConnectTimeout(CONNECTION_TIMEOUT);
             urlConnection.setDoOutput(bDoOutput);
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 416cde489..41c083898 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -430,8 +430,7 @@ public class LifecycleManager extends BaseLifecycleManager {
                         break;
                     case ON_SYSTEM_REQUEST:
                         final OnSystemRequest onSystemRequest = (OnSystemRequest) message;
-                        final String urlHttps = onSystemRequest.getUrl().replaceFirst("http://", "https://");
-                        if ((urlHttps != null) &&
+                        if ((onSystemRequest.getUrl() != null) &&
                                 (((onSystemRequest.getRequestType() == RequestType.PROPRIETARY) && (onSystemRequest.getFileType() == FileType.JSON))
                                         || ((onSystemRequest.getRequestType() == RequestType.HTTP) && (onSystemRequest.getFileType() == FileType.BINARY)))) {
                             Thread handleOffboardTransmissionThread = new Thread() {
@@ -444,15 +443,16 @@ public class LifecycleManager extends BaseLifecycleManager {
                                 }
                             };
                             handleOffboardTransmissionThread.start();
-                        }else if (onSystemRequest.getRequestType() == RequestType.ICON_URL) {
+                        }else if (onSystemRequest.getRequestType() == RequestType.ICON_URL && onSystemRequest.getUrl() != null) {
                             //Download the icon file and send SystemRequest RPC
                             Thread handleOffBoardTransmissionThread = new Thread() {
                                 @Override
                                 public void run() {
+                                    final String urlHttps = onSystemRequest.getUrl().replaceFirst("http://", "https://");
                                     byte[] file = FileUtls.downloadFile(urlHttps);
                                     if (file != null) {
                                         SystemRequest systemRequest = new SystemRequest();
-                                        systemRequest.setFileName(urlHttps);
+                                        systemRequest.setFileName(onSystemRequest.getUrl());
                                         systemRequest.setBulkData(file);
                                         systemRequest.setRequestType(RequestType.ICON_URL);
                                         if (isConnected()) {