Merge pull request #10909 from Stypox/fix-getAudioTrackType-null

Fix not considering nullability when comparing getAudioTrackType
2024-03-28 13:47:12 +01:00 · 2024-03-28 13:47:12 +01:00 · 81220f90d6
parent e0268a91ad 3a014d8d46
commit 81220f90d6
1 changed files with 2 additions and 1 deletions
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@ -874,6 +874,7 @@ public final class ListHelper {

        return Comparator.comparing(AudioStream::getAudioLocale, Comparator.nullsLast(
                        Comparator.comparing(locale -> locale.getDisplayName(appLoc))))
-                .thenComparing(AudioStream::getAudioTrackType);
+                .thenComparing(AudioStream::getAudioTrackType, Comparator.nullsLast(
+                        Comparator.naturalOrder()));
    }
 }