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

Stypox · web-flow · commit 81220f90d600 · 2024-03-28T13:47:12.000+01:00
Fix not considering nullability when comparing getAudioTrackType
diff --git 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 @@ private static Comparator<AudioStream> getAudioTrackNameComparator(
 
         return Comparator.comparing(AudioStream::getAudioLocale, Comparator.nullsLast(
                         Comparator.comparing(locale -> locale.getDisplayName(appLoc))))
-                .thenComparing(AudioStream::getAudioTrackType);
+                .thenComparing(AudioStream::getAudioTrackType, Comparator.nullsLast(
+                        Comparator.naturalOrder()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -874,6 +874,7 @@ private static Comparator<AudioStream> getAudioTrackNameComparator(`
`874`	`874`
`875`	`875`	`return Comparator.comparing(AudioStream::getAudioLocale, Comparator.nullsLast(`
`876`	`876`	`Comparator.comparing(locale -> locale.getDisplayName(appLoc))))`
`877`		`- .thenComparing(AudioStream::getAudioTrackType);`
	`877`	`+ .thenComparing(AudioStream::getAudioTrackType, Comparator.nullsLast(`
	`878`	`+ Comparator.naturalOrder()));`
`878`	`879`	`}`
`879`	`880`	`}`