nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-29 15:51:17 +00:00
Code Releases Activity

Fix home volume not recognized on Android 8 (fixes #58) (#59)

Browse source 
* Fix home volume not recognized on Android 8 (fixes #58)

* Fix Downloads volume not recognized on Android 8
This commit is contained in:
Catfriend1 2018-09-15 22:06:32 +02:00 committed by Audrius Butkevicius
parent 37c4574eca
commit d376ed7938
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java
View file

@ -31,6 +31,7 @@ public class FileUtils {
// Private constructor to enforce Singleton pattern. // Private constructor to enforce Singleton pattern.
} }
private static final String DOWNLOADS_VOLUME_NAME = "downloads";
private static final String PRIMARY_VOLUME_NAME = "primary"; private static final String PRIMARY_VOLUME_NAME = "primary";
private static final String HOME_VOLUME_NAME = "home"; private static final String HOME_VOLUME_NAME = "home";
@ -90,6 +91,17 @@ public class FileUtils {
return null; return null;
} }
try { try {
if (HOME_VOLUME_NAME.equals(volumeId)) {
Log.v(TAG, "getVolumePath: isHomeVolume");
// Reading the environment var avoids hard coding the case of the "documents" folder.
return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS).getAbsolutePath();
}
if (DOWNLOADS_VOLUME_NAME.equals(volumeId)) {
Log.v(TAG, "getVolumePath: isDownloadsVolume");
// Reading the environment var avoids hard coding the case of the "downloads" folder.
return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
}
StorageManager mStorageManager = StorageManager mStorageManager =
(StorageManager) context.getSystemService(Context.STORAGE_SERVICE); (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
Class<?> storageVolumeClazz = Class.forName("android.os.storage.StorageVolume"); Class<?> storageVolumeClazz = Class.forName("android.os.storage.StorageVolume");
@ -106,19 +118,22 @@ public class FileUtils {
Boolean primary = (Boolean) isPrimary.invoke(storageVolumeElement); Boolean primary = (Boolean) isPrimary.invoke(storageVolumeElement);
Boolean isPrimaryVolume = (primary && PRIMARY_VOLUME_NAME.equals(volumeId)); Boolean isPrimaryVolume = (primary && PRIMARY_VOLUME_NAME.equals(volumeId));
Boolean isExternalVolume = ((uuid != null) && uuid.equals(volumeId)); Boolean isExternalVolume = ((uuid != null) && uuid.equals(volumeId));
Boolean isHomeVolume = (uuid == null && HOME_VOLUME_NAME.equals(volumeId)); Log.d(TAG, "Found volume with uuid='" + uuid +
"', volumeId='" + volumeId +
"', primary=" + primary +
", isPrimaryVolume=" + isPrimaryVolume +
", isExternalVolume=" + isExternalVolume
);
if (isPrimaryVolume || isExternalVolume) { if (isPrimaryVolume || isExternalVolume) {
Log.v(TAG, "getVolumePath: isPrimaryVolume || isExternalVolume");
// Return path if the correct volume corresponding to volumeId was found. // Return path if the correct volume corresponding to volumeId was found.
return (String) getPath.invoke(storageVolumeElement); return (String) getPath.invoke(storageVolumeElement);
} else if (isHomeVolume) {
// Reading the environment var avoids hard coding the case of the "documents" folder.
return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS).getAbsolutePath();
} }
Log.d(TAG, "Skipping volume, uuid = '" + uuid + "', volumeId = '" + volumeId + "'");
} }
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, "getVolumePath exception", e); Log.w(TAG, "getVolumePath exception", e);
} }
Log.e(TAG, "getVolumePath failed for volumeId='" + volumeId + "'");
return null; return null;
} }