diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-04-08 16:59:25 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-04-08 16:59:25 -0400 |
| commit | 1831f2e8218f31bb9fb3128714b28ce4a32c6671 (patch) | |
| tree | 6c882728e9d66453d0b327327504ed256ec6163f /android | |
| parent | 40f79a08ae69f2f45d0eb1c11bdfaf119a78adc1 (diff) | |
| download | sdl_android-1831f2e8218f31bb9fb3128714b28ce4a32c6671.tar.gz | |
PR Changes requested
Diffstat (limited to 'android')
| -rw-r--r-- | android/sdl_android/src/androidTest/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java | 22 |
2 files changed, 10 insertions, 15 deletions
diff --git a/android/sdl_android/src/androidTest/AndroidManifest.xml b/android/sdl_android/src/androidTest/AndroidManifest.xml index d5dcc6b0d..071347d54 100644 --- a/android/sdl_android/src/androidTest/AndroidManifest.xml +++ b/android/sdl_android/src/androidTest/AndroidManifest.xml @@ -12,8 +12,7 @@ android:targetPackage="com.smartdevicelink.test" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> - <application - android:debuggable="true"> + <application android:debuggable="true"> <uses-library android:name="android.test.runner" /> </application> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java index d05f41d7e..2e81894ed 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java @@ -54,10 +54,8 @@ import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus; import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows; import com.smartdevicelink.proxy.rpc.enums.RequestType; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; -import com.smartdevicelink.util.AndroidTools; import com.smartdevicelink.util.DebugTool; -import java.io.IOException; import java.lang.ref.WeakReference; /** @@ -235,8 +233,7 @@ public class LockScreenManager extends BaseSubManager { if (msg.getRequestType() == RequestType.LOCK_SCREEN_ICON_URL && msg.getUrl() != null) { // send intent to activity to download icon from core - deviceIconUrl = msg.getUrl(); - deviceIconUrl = deviceIconUrl.replace("http://", "https://"); + deviceIconUrl = msg.getUrl().replace("http://", "https://"); downloadDeviceIcon(deviceIconUrl); } } @@ -384,6 +381,14 @@ public class LockScreenManager extends BaseSubManager { @Override public void onImageRetrieved(Bitmap icon) { deviceLogo = icon; + if(deviceLogo != null) { + Intent intent = new Intent(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_DOWNLOADED); + intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled); + intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo); + if (context.get() != null) { + context.get().sendBroadcast(intent); + } + } } @Override @@ -391,15 +396,6 @@ public class LockScreenManager extends BaseSubManager { DebugTool.logError(info); } }); - if(deviceLogo != null) { - Intent intent = new Intent(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_DOWNLOADED); - intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled); - intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo); - if (context.get() != null) { - context.get().sendBroadcast(intent); - } - } - } }).start(); } |