diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-05-14 16:01:05 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-05-14 16:01:05 -0400 |
| commit | 783bb25c5053baadd02dd4ff8fd5e99fb69c50bc (patch) | |
| tree | ae52ff1f4b13a823aaffdca225d1afdfe8e8d6a4 | |
| parent | 7bac20c6ec4bc178336281e1ec85ea47111e2d4b (diff) | |
| download | sdl_android-783bb25c5053baadd02dd4ff8fd5e99fb69c50bc.tar.gz | |
Add null check for urlHttp_to_Https
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 42 |
1 files changed, 22 insertions, 20 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 b94ad3f79..8c599c305 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 @@ -4300,28 +4300,30 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> //Cache this for when the lockscreen is displayed
lockScreenIconRequest = msg;
} else if (requestType == RequestType.ICON_URL) {
- //Download the icon file and send SystemRequest RPC
- Thread handleOffBoardTransmissionThread = new Thread() {
- @Override
- public void run() {
- String urlHttps = msg.getUrl().replaceFirst("http://", "https://");
- byte[] file = FileUtls.downloadFile(urlHttps);
- if (file != null) {
- SystemRequest systemRequest = new SystemRequest();
- systemRequest.setFileName(msg.getUrl());
- systemRequest.setBulkData(file);
- systemRequest.setRequestType(RequestType.ICON_URL);
- try {
- sendRPCMessagePrivate(systemRequest);
- } catch (SdlException e) {
- e.printStackTrace();
+ if (msg.getUrl() != null) {
+ //Download the icon file and send SystemRequest RPC
+ Thread handleOffBoardTransmissionThread = new Thread() {
+ @Override
+ public void run() {
+ String urlHttps = msg.getUrl().replaceFirst("http://", "https://");
+ byte[] file = FileUtls.downloadFile(urlHttps);
+ if (file != null) {
+ SystemRequest systemRequest = new SystemRequest();
+ systemRequest.setFileName(msg.getUrl());
+ systemRequest.setBulkData(file);
+ systemRequest.setRequestType(RequestType.ICON_URL);
+ try {
+ sendRPCMessagePrivate(systemRequest);
+ } catch (SdlException e) {
+ e.printStackTrace();
+ }
+ } else {
+ DebugTool.logError("File was null at: " + urlHttps);
}
- } else {
- DebugTool.logError("File was null at: " + urlHttps);
}
- }
- };
- handleOffBoardTransmissionThread.start();
+ };
+ handleOffBoardTransmissionThread.start();
+ }
}
}
|