diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-05-13 16:38:04 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-05-13 16:38:04 -0400 |
| commit | 360f504859fafb4801abadd13568c59bda4d55d1 (patch) | |
| tree | 10dca0e3210fd94226daae0e517df400ff06c140 /javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java | |
| parent | ffdfb525181f561e2fc3e1c018d530273f82f9b5 (diff) | |
| download | sdl_android-360f504859fafb4801abadd13568c59bda4d55d1.tar.gz | |
Feedback Fixes
Diffstat (limited to 'javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java')
| -rw-r--r-- | javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
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); } } }; |