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

Commit 816cf52a authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Fix the DEFAULT_SORT_ORDER value for media files. Changing this 

is OK, because existing app will have the old value compiled in
as a literal, and so will continue to (not) work in the same
way as before. Add code to media key generator to give a leading
ascii \001 the special meaning of "sort first".
parent 46841db4

api/4.xml

+2 −2
Original line number Diff line number Diff line
@@ -88821,7 +88821,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""title""

 value=""title_key""

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -88918,7 +88918,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""title""

 value=""title_key""

 static="true"

 final="true"

 deprecated="not deprecated"

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -104491,7 +104491,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""title""

 value=""title_key""

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -104588,7 +104588,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""title""

 value=""title_key""

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/provider/MediaStore.java

+13 −3
Original line number Diff line number Diff line
@@ -722,9 +722,15 @@ public final class MediaStore 
         */

        public static String keyFor(String name) {

            if (name != null)  {

                boolean sortfirst = false;

                if (name.equals(android.media.MediaFile.UNKNOWN_STRING)) {

                    return "\001";

                }

                // Check if the first character is \001. We use this to

                // force sorting of certain special files, like the silent ringtone.

                if (name.startsWith("\001")) {

                    sortfirst = true;

                }

                name = name.trim().toLowerCase();

                if (name.startsWith("the ")) {

                    name = name.substring(4);
@@ -753,7 +759,11 @@ public final class MediaStore 
                        b.append('.');

                    }

                    name = b.toString();

                    return DatabaseUtils.getCollationKey(name);

                    String key = DatabaseUtils.getCollationKey(name);

                    if (sortfirst) {

                        key = "\001" + key;

                    }

                    return key;

               } else {

                    return "";

                }
@@ -800,7 +810,7 @@ public final class MediaStore 
            /**

             * The default sort order for this table

             */

            public static final String DEFAULT_SORT_ORDER = TITLE;

            public static final String DEFAULT_SORT_ORDER = TITLE_KEY;



            /**

             * Activity Action: Start SoundRecorder application.
@@ -897,7 +907,7 @@ public final class MediaStore 
                /**

                 * The default sort order for this table

                 */

                public static final String DEFAULT_SORT_ORDER = TITLE;

                public static final String DEFAULT_SORT_ORDER = TITLE_KEY;



                /**

                 * The ID of the audio file