Merge pull request #11566 from nicholasala/fix/#10993-strange-playlist-order

Stypox · web-flow · commit f08e07873aee · 2024-11-10T15:45:33.000+01:00
Fixed playlist order
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
@@ -154,6 +154,6 @@ default Flowable<List<PlaylistStreamEntity>> listByService(final int serviceId)
             + " AND :streamUrl = :streamUrl"
 
             + " GROUP BY " + JOIN_PLAYLIST_ID
-            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX)
+            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX + ", " + PLAYLIST_NAME)
     Flowable<List<PlaylistDuplicatesEntry>> getPlaylistDuplicatesMetadata(String streamUrl);
 }

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,6 @@ default Flowable<List<PlaylistStreamEntity>> listByService(final int serviceId)`
`154`	`154`	`+ " AND :streamUrl = :streamUrl"`
`155`	`155`
`156`	`156`	`+ " GROUP BY " + JOIN_PLAYLIST_ID`
`157`		`- + " ORDER BY " + PLAYLIST_DISPLAY_INDEX)`
	`157`	`+ + " ORDER BY " + PLAYLIST_DISPLAY_INDEX + ", " + PLAYLIST_NAME)`
`158`	`158`	`Flowable<List<PlaylistDuplicatesEntry>> getPlaylistDuplicatesMetadata(String streamUrl);`
`159`	`159`	`}`