Feedback Fixes

3 files changed, 11 insertions, 9 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 9f9a72909..8ca9e6283 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
@@ -4127,7 +4127,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 						onRPCNotificationReceived(msg);

 					}

 				} else {

-					updateBroadcastIntent(sendIntent, "COMMENT1", "Sending to cloud: " + msg.getUrl().replaceFirst("http://", "https://"));

+					updateBroadcastIntent(sendIntent, "COMMENT1", "Sending to cloud: " + msg.getUrl());

 					sendBroadcastIntent(sendIntent);				

 					

 					Log.i("pt", "send to url");

@@ -4304,10 +4304,11 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 						Thread handleOffBoardTransmissionThread = new Thread() {

 							@Override

 							public void run() {

-								byte[] file = FileUtls.downloadFile(msg.getUrl().replaceFirst("http://", "https://"));

+								String urlHttps = msg.getUrl().replaceFirst("http://", "https://");

+								byte[] file = FileUtls.downloadFile(urlHttps);

 								if (file != null) {

 									SystemRequest systemRequest = new SystemRequest();

-									systemRequest.setFileName(msg.getUrl().replaceFirst("http://", "https://"));

+									systemRequest.setFileName(urlHttps);

 									systemRequest.setBulkData(file);

 									systemRequest.setRequestType(RequestType.ICON_URL);

 									try {

@@ -4316,7 +4317,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 										e.printStackTrace();

 									}

 								} else {

-									DebugTool.logError("File was null at: " + msg.getUrl().replaceFirst("http://", "https://"));

+									DebugTool.logError("File was null at: " + urlHttps);

 								}

 							}

 						};

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 3bf4710bd..9370d0218 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java
@@ -115,7 +115,7 @@ class PoliciesFetcher {
         HttpURLConnection urlConnection = null;
         boolean bLegacy = false;
 
-        String sURLString = msg.getUrl();
+        String sURLString = msg.getUrl().replaceFirst("http://", "https://");
 
         Integer iTimeout = msg.getTimeout();
 
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 1cd163422..e1d8e272e 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -430,7 +430,8 @@ public class LifecycleManager extends BaseLifecycleManager {
                         break;
                     case ON_SYSTEM_REQUEST:
                         final OnSystemRequest onSystemRequest = (OnSystemRequest) message;
-                        if ((onSystemRequest.getUrl() != null) &&
+                        String urlHttps = onSystemRequest.getUrl().replaceFirst("http://", "https://");
+                        if ((urlHttps != null) &&
                                 (((onSystemRequest.getRequestType() == RequestType.PROPRIETARY) && (onSystemRequest.getFileType() == FileType.JSON))
                                         || ((onSystemRequest.getRequestType() == RequestType.HTTP) && (onSystemRequest.getFileType() == FileType.BINARY)))) {
                             Thread handleOffboardTransmissionThread = new Thread() {
@@ -448,17 +449,17 @@ public class LifecycleManager extends BaseLifecycleManager {
                             Thread handleOffBoardTransmissionThread = new Thread() {
                                 @Override
                                 public void run() {
-                                    byte[] file = FileUtls.downloadFile(onSystemRequest.getUrl());
+                                    byte[] file = FileUtls.downloadFile(urlHttps);
                                     if (file != null) {
                                         SystemRequest systemRequest = new SystemRequest();
-                                        systemRequest.setFileName(onSystemRequest.getUrl());
+                                        systemRequest.setFileName(urlHttps);
                                         systemRequest.setBulkData(file);
                                         systemRequest.setRequestType(RequestType.ICON_URL);
                                         if (isConnected()) {
                                             sendRPCMessagePrivate(systemRequest);
                                         }
                                     } else {
-                                        DebugTool.logError("File was null at: " + onSystemRequest.getUrl());
+                                        DebugTool.logError("File was null at: " + urlHttps);
                                     }
                                 }
                             };