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

Commit 9f0b1a48 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Do case-insensitive matching when determining whether something is music, an... 

Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc.
parent c9a3b66d

media/java/android/media/MediaScanner.java

+6 −5
Original line number Diff line number Diff line
@@ -453,11 +453,12 @@ public class MediaScanner 
                FileCacheEntry entry = beginFile(path, mimeType, lastModified, fileSize);

                // rescan for metadata if file was modified since last scan

                if (entry != null && (entry.mLastModifiedChanged || scanAlways)) {

                    boolean ringtones = (path.indexOf(RINGTONES_DIR) > 0);

                    boolean notifications = (path.indexOf(NOTIFICATIONS_DIR) > 0);

                    boolean alarms = (path.indexOf(ALARMS_DIR) > 0);

                    boolean podcasts = (path.indexOf(PODCAST_DIR) > 0);

                    boolean music = (path.indexOf(MUSIC_DIR) > 0) ||

                    String lowpath = path.toLowerCase();

                    boolean ringtones = (lowpath.indexOf(RINGTONES_DIR) > 0);

                    boolean notifications = (lowpath.indexOf(NOTIFICATIONS_DIR) > 0);

                    boolean alarms = (lowpath.indexOf(ALARMS_DIR) > 0);

                    boolean podcasts = (lowpath.indexOf(PODCAST_DIR) > 0);

                    boolean music = (lowpath.indexOf(MUSIC_DIR) > 0) ||

                        (!ringtones && !notifications && !alarms && !podcasts);



                    if (mFileType == MediaFile.FILE_TYPE_MP3 ||