fixes #400

Author: nift4

app/src/main/java/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt

@@ -178,9 +178,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
                 controller?.repeatMode = REPEAT_MODE_OFF
                 controller?.shuffleModeEnabled = false
                 list.takeIf { it.isNotEmpty() }?.also { albums ->
-                    controller?.setMediaItems(albums.flatMap { it.songList.sortedBy { song ->
-                        (song.mediaMetadata.discNumber ?: 0) * 1000 +
-                                (song.mediaMetadata.trackNumber ?: 0) } })
+                    controller?.setMediaItems(albums.flatMap { it.songList })
                     controller?.prepare()
                     controller?.play()
                 } ?: controller?.setMediaItems(listOf())
@@ -202,10 +200,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
                 controller?.repeatMode = REPEAT_MODE_OFF
                 controller?.shuffleModeEnabled = false
                 list.takeIf { it.isNotEmpty() }?.also { albums ->
-	                controller?.setMediaItems(albums.shuffled()
-                        .flatMap { it.songList.sortedBy { song ->
-                            (song.mediaMetadata.discNumber ?: 0) * 1000 +
-                                    (song.mediaMetadata.trackNumber ?: 0) } })
+	                controller?.setMediaItems(albums.shuffled().flatMap { it.songList })
                     controller?.prepare()
                     controller?.play()
                 } ?: controller?.setMediaItems(listOf())

app/src/main/java/uk/akane/libphonograph/reader/Reader.kt

@@ -11,6 +11,12 @@ import androidx.media3.common.HeartRating
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.util.UnstableApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.withContext
 import org.akanework.gramophone.logic.hasAudioPermission
 import org.akanework.gramophone.logic.hasImagePermission
 import org.akanework.gramophone.logic.hasImprovedMediaStore
@@ -42,6 +48,7 @@ import uk.akane.libphonograph.utils.MiscUtils.handleShallowMediaItem
 import java.io.File
 import java.time.Instant
 import java.time.ZoneId
+import kotlin.math.min
 
 internal object Reader {
     // not actually defined in API, but CTS tested
@@ -106,7 +113,7 @@ internal object Reader {
      * without much hassle.
      */
     @OptIn(UnstableApi::class)
-    fun readFromMediaStore(
+    suspend fun readFromMediaStore(
         context: Context,
         minSongLengthSeconds: Long = 0,
         blackListSet: Set<String> = setOf(),
@@ -412,6 +419,20 @@ internal object Reader {
                 }
             }
         }?.toList<Album>()
+        if (!albumList.isNullOrEmpty()) {
+            supervisorScope {
+                for (i in 0..(albumList.size / 100)) {
+                    launch {
+                        for (j in (i * 100)..<min(i * 100 + 100, albumList.size)) {
+                            (albumList[j].songList as MutableList).sortBy {
+                                (it.mediaMetadata.discNumber ?: 0) * 1000 +
+                                        (it.mediaMetadata.trackNumber ?: 0)
+                            }
+                        }
+                    }
+                }
+            }
+        }
         val artistList = artistMap?.values?.toList()
         val albumArtistList = albumArtistMap?.values?.toList()
         val genreList = genreMap?.values?.toList()

app/src/main/java/uk/akane/libphonograph/reader/SimpleReader.kt

@@ -1,6 +1,9 @@
 package uk.akane.libphonograph.reader
 
 import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import uk.akane.libphonograph.dynamicitem.RecentlyAdded
 
 object SimpleReader {
@@ -14,9 +17,15 @@ object SimpleReader {
         coverStubUri: String? = null
     ): SimpleReaderResult {
         val (playlists, foundPlaylistContent) = Reader.fetchPlaylists(context)
-        val result = Reader.readFromMediaStore(context, minSongLengthSeconds, blackListSet,
-            shouldUseEnhancedCoverReading, shouldIncludeExtraFormat,
-            shouldLoadIdMap = foundPlaylistContent, coverStubUri = coverStubUri)
+        val result = runBlocking {
+            withContext(Dispatchers.Default) {
+                Reader.readFromMediaStore(
+                    context, minSongLengthSeconds, blackListSet,
+                    shouldUseEnhancedCoverReading, shouldIncludeExtraFormat,
+                    shouldLoadIdMap = foundPlaylistContent, coverStubUri = coverStubUri
+                )
+            }
+        }
         // We can null assert because we never pass shouldLoad*=false into Reader
         return SimpleReaderResult(
             result.songList,