mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix crash in buildStorageItem()

Browse source 
See also #538
Closes #632

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-06-19 00:43:40 +03:00
parent 6501409aa5
commit 8db94f446b
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/mapswithme/maps/settings/StoragePathManager.java
View file

@ -153,6 +153,11 @@ public class StoragePathManager
// External storages (SD cards and other).
for (File dir : application.getExternalFilesDirs(null))
{
// There was an evidence that `dir` can be null on some Samsungs.
// https://github.com/organicmaps/organicmaps/issues/632
if (dir == null)
continue;
//
// If the contents of emulated storage devices are backed by a private user data partition,
// then there is little benefit to apps storing data here instead of the private directories
@ -173,8 +178,11 @@ public class StoragePathManager
candidates.add(dir);
}
// Internal storage (always exists).
candidates.add(application.getFilesDir());
// Internal storage must always exists, but Android is unpredictable.
// https://github.com/organicmaps/organicmaps/issues/632
File internalDir = application.getFilesDir();
if (internalDir != null)
candidates.add(internalDir);
// Configured path.
String configDir = Config.getStoragePath();
@ -224,7 +232,7 @@ public class StoragePathManager
}
}
private static StorageItem buildStorageItem(File dir)
private static StorageItem buildStorageItem(@NonNull File dir)
{
String path = dir.getAbsolutePath();
LOGGER.d(TAG, "Check storage : " + path);