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

[android] Fix strange but possible crash in StoragePath.

Browse source
This commit is contained in:
vng 2014-08-17 16:39:28 +03:00 • committed by Alex Zolotarev
parent 2909cc9b7c
commit 7dd7d7584a
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,11 +142,14 @@ public class StoragePathManager
parseMountFiles(paths);
Map<Long, String> pathsSizesMap = new HashMap<Long, String>();
// Add current path first!
final String currentStorageDir = getWritableDirRoot();
addStoragePathWithSize(currentStorageDir, pathsSizesMap);
for (String path : paths)
addStoragePathWithSize(path, pathsSizesMap);
addStoragePathWithSize(Environment.getExternalStorageDirectory().getAbsolutePath(), pathsSizesMap);
String currentStorageDir = getWritableDirRoot();
addStoragePathWithSize(currentStorageDir, pathsSizesMap);
mItems = new ArrayList<StoragePathAdapter.StorageItem>();
mCurrentStorageIndex = -1;
@ -157,6 +160,12 @@ public class StoragePathManager
if (item.mPath.equals(currentStorageDir))
mCurrentStorageIndex = mItems.size() - 1;
}
if (mCurrentStorageIndex == -1)
{
Log.w(TAG, "Unrecognized current path: " + currentStorageDir);
Log.w(TAG, "Parsed paths: " + Utils.mapPrettyPrint(pathsSizesMap));
}
}
public ArrayList<StoragePathAdapter.StorageItem> getStorageItems()
@ -399,14 +408,18 @@ public class StoragePathManager
private static boolean doMoveMaps(StoragePathAdapter.StorageItem newStorage, StoragePathAdapter.StorageItem oldStorage)
{
final String fullNewPath = getItemFullPath(newStorage);
// According to onStorageItemClick code above, oldStorage can be null.
if (oldStorage == null)
{
Log.w(TAG, "Old storage path is null. New path is: " + fullNewPath);
return false;
}
String fullOldPath = getItemFullPath(oldStorage);
String fullNewPath = getItemFullPath(newStorage);
File oldDir = new File(fullOldPath);
File newDir = new File(fullNewPath);
final String fullOldPath = getItemFullPath(oldStorage);
final File oldDir = new File(fullOldPath);
final File newDir = new File(fullNewPath);
if (!newDir.exists())
newDir.mkdir();
@ -431,6 +444,13 @@ public class StoragePathManager
}
});
// Strange thing: null only if oldDir is not a directory, but it fires according to the developer console.
if (internalFiles == null)
{
Log.w(TAG, "Source path is not a directory: " + fullOldPath);
return false;
}
try
{
for (File moveFile : internalFiles)
@ -438,7 +458,8 @@ public class StoragePathManager
if (!MapStorage.nativeMoveFile(moveFile.getAbsolutePath(), fullNewPath + moveFile.getName()))
copyFile(moveFile, new File(fullNewPath + moveFile.getName()));
}
} catch (IOException e)
}
catch (IOException e)
{
for (File moveFile : internalFiles)
new File(fullNewPath + moveFile.getName()).delete();