Use Collators to make sure special characters are sorted correctly

1 files changed, 9 insertions, 3 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
index cd84c0a3..4df56022 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
@@ -24,6 +24,8 @@ import android.content.SharedPreferences;
 import android.media.MediaMetadataRetriever;
 import android.os.Build;
 import android.util.Log;
+
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -31,6 +33,7 @@ import java.io.File;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Locale;
 
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.util.Constants;
@@ -617,9 +620,12 @@ public class MusicDirectory implements Serializable {
 	
 	public static class EntryComparator implements Comparator<Entry> {
 		private boolean byYear;
+		private Collator collator;
 		
 		public EntryComparator(boolean byYear) {
 			this.byYear = byYear;
+			this.collator = Collator.getInstance(Locale.US);
+			this.collator.setStrength(Collator.PRIMARY);
 		}
 		
 		public int compare(Entry lhs, Entry rhs) {
@@ -639,8 +645,8 @@ public class MusicDirectory implements Serializable {
 						return 1;
 					}
 				}
-				
-				return lhs.getAlbumDisplay().compareToIgnoreCase(rhs.getAlbumDisplay());
+
+				return collator.compare(lhs.getAlbumDisplay(), rhs.getAlbumDisplay());
 			}
 			
 			Integer lhsDisc = lhs.getDiscNumber();
@@ -664,7 +670,7 @@ public class MusicDirectory implements Serializable {
 				return 1;
 			}
 
-			return lhs.getTitle().compareToIgnoreCase(rhs.getTitle());
+			return collator.compare(lhs.getTitle(), rhs.getTitle());
 		}
 		
 		public static void sort(List<Entry> entries) {