From 06eebada2c74c57504d8cc1cdfa446ee77d48fce Mon Sep 17 00:00:00 2001 From: JiboStore Date: Tue, 9 Mar 2021 22:46:38 +0800 Subject: [PATCH] fix(app, android): fixes possible crash on first launch (#4990) Fixes #4979 --- .../firebase/utils/ReactNativeFirebaseUtilsModule.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java b/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java index cf6e909b90..7af6e49531 100644 --- a/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java +++ b/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java @@ -159,9 +159,11 @@ public Map getConstants() { constants.put(KEY_TEMP_DIRECTORY, context.getCacheDir().getAbsolutePath()); constants.put(KEY_CACHE_DIRECTORY, context.getCacheDir().getAbsolutePath()); - + File externalDirectory = context.getExternalFilesDir(null); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - constants.put(KEY_DOCUMENT_DIRECTORY, context.getExternalFilesDir(null).getAbsolutePath()); + if ( externalDirectory != null ) { + constants.put(KEY_DOCUMENT_DIRECTORY, externalDirectory.getAbsolutePath()); + } } else { constants.put(KEY_DOCUMENT_DIRECTORY, context.getFilesDir().getAbsolutePath()); } @@ -179,7 +181,6 @@ public Map getConstants() { constants.put(KEY_EXT_STORAGE_DIRECTORY, externalStorageDirectory.getAbsolutePath()); } - File externalDirectory = context.getExternalFilesDir(null); if (externalDirectory != null) { constants.put(KEY_EXTERNAL_DIRECTORY, externalDirectory.getAbsolutePath()); }