kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Correctly get size of storage directory tree.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-08-03 16:53:11 +03:00 • committed by Alex Zolotarev
parent 9b4c05b6f2
commit e95a650f4c
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,19 @@ import java.util.Set;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class StoragePathManager
{
private static final String[] MOVABLE_EXTS = Framework.nativeGetMovableFilesExts();
private static final FilenameFilter MOVABLE_FILES_FILTER = new FilenameFilter() {
@Override
public boolean accept(File dir, String filename)
{
for (String ext : MOVABLE_EXTS)
if (filename.endsWith(ext))
return true;
return false;
}
};
public interface MoveFilesListener
{
void moveFilesFinished(String newPath);
@ -241,7 +254,6 @@ public class StoragePathManager
parseMountFile("/proc/mounts", MOUNTS_MODE, paths);
}
// TODO count inner files
public static long getMwmDirSize()
{
final File writableDir = new File(Framework.nativeGetWritableDir());
@ -253,15 +265,7 @@ public class StoragePathManager
throw new IllegalStateException("Writable directory isn't a directory, can't get size.");
}
final File[] files = writableDir.listFiles();
if (files == null)
return 0;
long size = 0;
for (final File f : files)
size += f.length();
return size;
return getDirSizeRecursively(writableDir, MOVABLE_FILES_FILTER);
}
public boolean moveBookmarksToPrimaryStorage()
@ -614,21 +618,8 @@ public class StoragePathManager
throw new IllegalStateException("Cannot move maps. New path is not writable. New path : " + fullNewPath);
}
final String[] exts = Framework.nativeGetMovableFilesExts();
ArrayList<String> relPaths = new ArrayList<>();
listFilesRecursively(oldDir, "", new FilenameFilter()
{
@Override
public boolean accept(File dir, String name)
{
for (String ext : exts)
{
if (name.endsWith(ext))
return true;
}
return false;
}
}, relPaths);
listFilesRecursively(oldDir, "", MOVABLE_FILES_FILTER, relPaths);
File[] oldFiles = new File[relPaths.size()];
File[] newFiles = new File[relPaths.size()];
@ -702,6 +693,24 @@ public class StoragePathManager
}
}
private static long getDirSizeRecursively(File file, FilenameFilter fileFilter)
{
if (file.isDirectory())
{
long dirSize = 0;
for (File child : file.listFiles())
dirSize += getDirSizeRecursively(child, fileFilter);
return dirSize;
}
if (fileFilter.accept(file.getParentFile(), file.getName()))
return file.length();
return 0;
}
private class MoveFilesTask extends AsyncTask<String, Void, Integer>
{
private final ProgressDialog mDlg;