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

Commit dd954c7d authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "CMFM: Fix name and parent for root directory" into cm-10.1

parents 663db102 75b87a32

src/com/cyanogenmod/filemanager/FileManagerApplication.java

+0 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ public final class FileManagerApplication extends Application { 
        sIsDeviceRooted = areShellCommandsPresent();



        //Sets the default preferences if no value is set yet

        FileHelper.ROOT_DIRECTORY = getString(R.string.root_dir);

        Preferences.loadDefaults();



        // Read AIDs

src/com/cyanogenmod/filemanager/model/FileSystemObject.java

+6 −6
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ public abstract class FileSystemObject implements Serializable, Comparable<FileS 
        return o1.compareTo(o2);

    }



    /* (non-Javadoc)

     * @see java.lang.Object#hashCode()

    /**

     * {@inheritDoc}

     */

    @Override

    public int hashCode() {
@@ -318,8 +318,8 @@ public abstract class FileSystemObject implements Serializable, Comparable<FileS 
        return result;

    }



    /* (non-Javadoc)

     * @see java.lang.Object#equals(java.lang.Object)

    /**

     * {@inheritDoc}

     */

    @Override

    public boolean equals(Object obj) {
@@ -353,8 +353,8 @@ public abstract class FileSystemObject implements Serializable, Comparable<FileS 
                getPermissions().toRawString());

    }



    /* (non-Javadoc)

     * @see java.lang.Object#toString()

    /**

     * {@inheritDoc}

     */

    @Override

    public String toString() {

src/com/cyanogenmod/filemanager/util/FileHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public final class FileHelper { 
     * The root directory.

     * @hide

     */

    public static String ROOT_DIRECTORY = "/";  //$NON-NLS-1$

    public static final String ROOT_DIRECTORY = "/";  //$NON-NLS-1$



    /**

     * The parent directory string.
@@ -327,7 +327,7 @@ public final class FileHelper { 
     */

    public static String getParentDir(File path) {

        String parent = path.getParent();

        if (parent == null) {

        if (parent == null && path.getAbsolutePath().compareTo(FileHelper.ROOT_DIRECTORY) != 0) {

            parent = FileHelper.ROOT_DIRECTORY;

        }

        return parent;

src/com/cyanogenmod/filemanager/util/ParseHelper.java

+7 −1
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ public final class ParseHelper { 
            long size = getTerseStatLong(data, TERSE_STAT_STRUCT.SIZE);

            File file = new File(getTerseStatName(data));

            String name = file.getName();

            if (name.trim().length() == 0) {

                name = FileHelper.ROOT_DIRECTORY;

            }

            String parentDir = FileHelper.getParentDir(file);



            // Create the file system object
@@ -350,7 +353,10 @@ public final class ParseHelper { 
            Date lastAccessedTime, Date lastModifiedTime, Date lastChangedTime)

            throws ParseException {



        String parent = (parentDir == null) ? FileHelper.ROOT_DIRECTORY : parentDir;

        String parent =

                (parentDir == null && name.compareTo(FileHelper.ROOT_DIRECTORY) != 0) ?

                            FileHelper.ROOT_DIRECTORY :

                            parentDir;



        if (type == RegularFile.UNIX_ID) {

            return new RegularFile(