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

[android] Fixed null crash when calculating directory size

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-05-31 00:00:14 +02:00 • committed by Viktor Govako
parent a91d5ec26c
commit 575cfbfd25
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/src/com/mapswithme/util/StorageUtils.java
View file

@ -250,12 +250,21 @@ public class StorageUtils
}
}
/**
* Returns 0 in case of the error or if no files have passed the filter.
*/
public static long getDirSizeRecursively(File file, FilenameFilter fileFilter)
{
if (file.isDirectory())
{
final File[] list = file.listFiles();
if (list == null)
{
LOGGER.w(TAG, "getDirSizeRecursively dirFiles returned null");
return 0;
}
long dirSize = 0;
for (File child : file.listFiles())
for (File child : list)
dirSize += getDirSizeRecursively(child, fileFilter);
return dirSize;
@ -270,7 +279,10 @@ public class StorageUtils
@SuppressWarnings("ResultOfMethodCallIgnored")
public static void removeEmptyDirectories(File dir)
{
for (File file : dir.listFiles())
final File[] list = dir.listFiles();
if (list == null)
return;
for (File file : list)
{
if (!file.isDirectory())
continue;