Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fffd8fc5 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed check for visible volume.

Previously it was checked if the volume was visible to user, but
transient volumes (such as USB drives) are not marked as such.

Fixes: 29174953
Change-Id: I5dbcc42c5b31c6856e01f73815d73482822785d9
parent 3ee56ca4
Loading
Loading
Loading
Loading
+9 −8
Original line number Diff line number Diff line
@@ -287,15 +287,16 @@ public class OpenExternalDirectoryActivity extends Activity {
    private static boolean isRightVolume(VolumeInfo volume, String root, int userId) {
        final File userPath = volume.getPathForUser(userId);
        final String path = userPath == null ? null : volume.getPathForUser(userId).getPath();
        final boolean isVisible = volume.isVisibleForWrite(userId);
        final boolean isMounted = volume.isMountedReadable();
        if (DEBUG)
            Log.d(TAG, "Volume: " + volume + " userId: " + userId + " root: " + root
                    + " volumePath: " + volume.getPath()
                    + " pathForUser: " + path
                    + " internalPathForUser: " + volume.getInternalPath()
                    + " isVisible: " + isVisible);

        return isVisible && root.equals(path);
            Log.d(TAG, "Volume: " + volume
                    + "\n\tuserId: " + userId
                    + "\n\tuserPath: " + userPath
                    + "\n\troot: " + root
                    + "\n\tpath: " + path
                    + "\n\tisMounted: " + isMounted);

        return isMounted && root.equals(path);
    }

    private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider,