From db6eaa0c348026c6afa74744a0433ccb41fe7b83 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 19 Dec 2017 09:20:52 +0100 Subject: [android] - use default icon when compass icon fails to decode (#10694) --- .../src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index e71d509fcf..c119d869b1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -191,6 +191,12 @@ public final class UiSettings { } private Drawable decode(byte[] bitmap) { + if (bitmap == null) { + // return default icon + return compassView.getResources().getDrawable(R.drawable.mapbox_compass_icon); + } + + // try decoding saved bitmap Bitmap compass = BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length); return new BitmapDrawable(compassView.getResources(), compass); } -- cgit v1.2.1