From b9029e765d741372807f010c2f06f0bcba693edc Mon Sep 17 00:00:00 2001 From: Tobrun Date: Mon, 15 Oct 2018 11:34:19 +0200 Subject: [android] - avoid printing exception for valid code execution path --- .../main/java/com/mapbox/mapboxsdk/storage/FileSource.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java index ec75f66112..5723b71ef9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java @@ -82,15 +82,18 @@ public class FileSource { @Deprecated public static String getCachePath(@NonNull Context context) { // Default value - boolean setStorageExternal = MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL; + boolean isExternalStorageConfiguration = MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL; try { // Try getting a custom value from the app Manifest ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA); - setStorageExternal = appInfo.metaData.getBoolean( - MapboxConstants.KEY_META_DATA_SET_STORAGE_EXTERNAL, - MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL); + if (appInfo.metaData != null) { + isExternalStorageConfiguration = appInfo.metaData.getBoolean( + MapboxConstants.KEY_META_DATA_SET_STORAGE_EXTERNAL, + MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL + ); + } } catch (PackageManager.NameNotFoundException exception) { Logger.e(TAG, "Failed to read the package metadata: ", exception); MapStrictMode.strictModeViolation(exception); @@ -100,7 +103,7 @@ public class FileSource { } String cachePath = null; - if (setStorageExternal && isExternalStorageReadable()) { + if (isExternalStorageConfiguration && isExternalStorageReadable()) { try { // Try getting the external storage path cachePath = context.getExternalFilesDir(null).getAbsolutePath(); -- cgit v1.2.1