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

[android] Remove extra mkdir() writability test needed for KitKat

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2022-04-24 08:35:42 +03:00 • committed by Alexander Borsuk
parent eef2d289fa
commit 2fc0453127
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,8 +222,7 @@ public class StoragePathManager
LOGGER.i(TAG, "Rejected " + path + ": not a directory");
continue;
}
if (!dir.canWrite() || !StorageUtils.isDirWritable(path))
if (!dir.canWrite())
{
LOGGER.i(TAG, "Rejected " + path + ": not writable");
continue;
@ -443,7 +442,7 @@ public class StoragePathManager
throw new IllegalStateException("Cannot move maps. New path is not a directory. New path : " + newDir);
if (!oldDir.isDirectory())
throw new IllegalStateException("Cannot move maps. Old path is not a directory. Old path : " + oldDir);
if (!StorageUtils.isDirWritable(fullNewPath))
if (!newDir.canWrite())
throw new IllegalStateException("Cannot move maps. New path is not writable. New path : " + fullNewPath);
}

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

@ -250,26 +250,6 @@ public class StorageUtils
}
}
/**
* Check if directory is writable. On some devices with KitKat (eg, Samsung S4) simple File.canWrite() returns
* true for some actually read only directories on sdcard.
* see https://code.google.com/p/android/issues/detail?id=66369 for details
*
* @param path path to ckeck
* @return result
*/
@SuppressWarnings("ResultOfMethodCallIgnored")
public static boolean isDirWritable(String path)
{
File f = new File(path, "mapsme_test_dir");
f.mkdir();
if (!f.exists())
return false;
f.delete();
return true;
}
public static long getFreeBytesAtPath(String path)
{
long size = 0;