diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-04-07 15:48:00 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-04-07 15:48:00 -0400 |
| commit | 6ba6b8ec822f250dfa1eb6eda4c4b17dc9d7ebc1 (patch) | |
| tree | 8295ea0c228b79c7cae3b0443005daf37176584e /android/sdl_android/src/main/java/com/smartdevicelink/proxy | |
| parent | 3ea5100f672e74715d3e510b66ca779f549b124b (diff) | |
| download | sdl_android-6ba6b8ec822f250dfa1eb6eda4c4b17dc9d7ebc1.tar.gz | |
Replace http urls with https for android/javaSE
Diffstat (limited to 'android/sdl_android/src/main/java/com/smartdevicelink/proxy')
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 11 |
1 files changed, 6 insertions, 5 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 f6f5c7688..80b7f5b15 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 @@ -1294,6 +1294,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
sURLString = msg.getUrl();
}
+ sURLString = sURLString.replaceFirst("http://", "https://");
Integer iTimeout = msg.getTimeout();
@@ -4113,7 +4114,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> onRPCNotificationReceived(msg);
}
} else {
- updateBroadcastIntent(sendIntent, "COMMENT1", "Sending to cloud: " + msg.getUrl());
+ updateBroadcastIntent(sendIntent, "COMMENT1", "Sending to cloud: " + msg.getUrl().replaceFirst("http://", "https://"));
sendBroadcastIntent(sendIntent);
Log.i("pt", "send to url");
@@ -4290,10 +4291,10 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> Thread handleOffBoardTransmissionThread = new Thread() {
@Override
public void run() {
- byte[] file = FileUtls.downloadFile(msg.getUrl());
+ byte[] file = FileUtls.downloadFile(msg.getUrl().replaceFirst("http://", "https://"));
if (file != null) {
SystemRequest systemRequest = new SystemRequest();
- systemRequest.setFileName(msg.getUrl());
+ systemRequest.setFileName(msg.getUrl().replaceFirst("http://", "https://"));
systemRequest.setBulkData(file);
systemRequest.setRequestType(RequestType.ICON_URL);
try {
@@ -4302,7 +4303,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> e.printStackTrace();
}
} else {
- DebugTool.logError("File was null at: " + msg.getUrl());
+ DebugTool.logError("File was null at: " + msg.getUrl().replaceFirst("http://", "https://"));
}
}
};
@@ -5829,7 +5830,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> l.onLockScreenIconDownloaded(bitmap);
}
else{
- String url = lockScreenIconRequest.getUrl();
+ String url = lockScreenIconRequest.getUrl().replaceFirst("http://", "https://");
sdlSession.getLockScreenMan().downloadLockScreenIcon(url, l);
}
}
|