Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

Fix review findings in local files, default sorting and the Connect queue

Lelonio1f0cecb5a2e1
diff --git a/app/src/main/java/dev/lelonio/square/data/LocalLibrary.kt b/app/src/main/java/dev/lelonio/square/data/LocalLibrary.kt
index fc9890a..3b6b4a7 100644
--- a/app/src/main/java/dev/lelonio/square/data/LocalLibrary.kt
+++ b/app/src/main/java/dev/lelonio/square/data/LocalLibrary.kt
@@ -185,9 +185,21 @@ object LocalLibrary {
collection(),
columns,
// Downloaded MP3s are not always marked IS_MUSIC. Include indexed
- // audio while excluding files assigned to system alerts.
- "${MediaStore.Audio.Media.DURATION} > 0 AND ${MediaStore.Audio.Media.IS_RINGTONE} = 0 " +
- "AND ${MediaStore.Audio.Media.IS_NOTIFICATION} = 0 AND ${MediaStore.Audio.Media.IS_ALARM} = 0",
+ // audio while excluding files assigned to system alerts — and
+ // what is plainly not music either: podcasts, audiobooks and,
+ // where Android marks them, voice recordings, which would
+ // otherwise have put someone's memos in their music library.
+ buildString {
+ append("${MediaStore.Audio.Media.DURATION} > 0 AND ${MediaStore.Audio.Media.IS_RINGTONE} = 0 ")
+ append("AND ${MediaStore.Audio.Media.IS_NOTIFICATION} = 0 AND ${MediaStore.Audio.Media.IS_ALARM} = 0 ")
+ append("AND ${MediaStore.Audio.Media.IS_PODCAST} = 0")
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ append(" AND ${MediaStore.Audio.Media.IS_AUDIOBOOK} = 0")
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ append(" AND ${MediaStore.Audio.Media.IS_RECORDING} = 0")
+ }
+ },
null,
"${MediaStore.Audio.Media.DATE_ADDED} DESC",
)?.use { cursor ->
diff --git a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt
index e423e05..fba8f94 100644
--- a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt
+++ b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt
@@ -27,6 +27,13 @@ class PreferencesStore(context: Context) {
)
val trackOrders = _trackOrders.asStateFlow()
+ /**
+ * The one order every playlist shared before each kept its own, for the
+ * playlists that have not been given one yet: without it an update put
+ * every list back in playlist order.
+ */
+ val defaultTrackOrder = TrackOrder(prefs.getString(KEY_TRACK_SORT, null), prefs.getBoolean(KEY_TRACK_DESC, false))
+
fun setTrackSort(uri: String, value: String) {
val previous = _trackOrders.value[uri] ?: TrackOrder()
_trackOrders.value = _trackOrders.value + (uri to previous.copy(sort = value))
diff --git a/app/src/main/java/dev/lelonio/square/data/RemoteConnect.kt b/app/src/main/java/dev/lelonio/square/data/RemoteConnect.kt
index 31c1f37..c1f9009 100644
--- a/app/src/main/java/dev/lelonio/square/data/RemoteConnect.kt
+++ b/app/src/main/java/dev/lelonio/square/data/RemoteConnect.kt
@@ -211,12 +211,15 @@ object RemoteConnect {
/** The upcoming tracks looked up so far, kept by uri like [known]. */
private val knownNext = mutableMapOf<String, RemoteTrack>()
+ private const val KNOWN_LIMIT = 500
/**
* What was looked up about the upcoming tracks, kept and put on the
* playback shown now; see [describe], which does the same for the current one.
*/
fun describeNext(tracks: List<RemoteTrack>) {
+ // Bounded, like the service's own record of what it asked.
+ if (knownNext.size > KNOWN_LIMIT) knownNext.clear()
tracks.forEach { knownNext[it.uri] = it }
val current = _playback.value ?: return
_playback.value = current.filled()
@@ -224,6 +227,8 @@ object RemoteConnect {
/** Forgets everything. For a session ending, where none of it is true any more. */
fun clear() {
+ known.clear()
+ knownNext.clear()
playingAtOpen = null
sdkId = null
_elsewhere.value = false
diff --git a/app/src/main/java/dev/lelonio/square/playback/PlaybackService.kt b/app/src/main/java/dev/lelonio/square/playback/PlaybackService.kt
index 220b4a8..f96e0f4 100644
--- a/app/src/main/java/dev/lelonio/square/playback/PlaybackService.kt
+++ b/app/src/main/java/dev/lelonio/square/playback/PlaybackService.kt
@@ -1070,6 +1070,7 @@ class PlaybackService : MediaLibraryService() {
/** Upcoming tracks already asked about, so a run of updates asks once. */
private val askedNext = mutableSetOf<String>()
+ private val ASKED_NEXT_LIMIT = 500
/**
* Names the tracks coming up on the other device that it did not name.
@@ -1082,7 +1083,9 @@ class PlaybackService : MediaLibraryService() {
private suspend fun describeRemoteNext(playback: dev.lelonio.square.data.RemotePlayback) {
val unnamed = playback.next.filter { it.title.isEmpty() && it.uri !in askedNext }
if (unnamed.isEmpty()) return
- askedNext += unnamed.map { it.uri }
+ // Bounded: a day of following another device's queue is a lot of
+ // tracks, and an answer already given is kept by RemoteConnect.
+ if (askedNext.size > ASKED_NEXT_LIMIT) askedNext.clear()
val local = unnamed.filter { dev.lelonio.square.data.LocalLibrary.isSpotifyLocal(it.uri) }.map { track ->
val parts = track.uri.removePrefix(dev.lelonio.square.data.LocalLibrary.SPOTIFY_PREFIX).split(':')
.map { runCatching { java.net.URLDecoder.decode(it, "UTF-8") }.getOrDefault(it) }
@@ -1097,6 +1100,10 @@ class PlaybackService : MediaLibraryService() {
dev.lelonio.square.data.RemoteTrack(track.uri, track.name, track.artist, track.artworkUrl.orEmpty())
}
}
+ // Only what was answered counts as asked: a read that failed on a
+ // dropped connection is tried again with the next update, rather than
+ // leaving those tracks without a name for the rest of the session.
+ askedNext += local.map { it.uri } + read.map { it.uri }
if (local.isNotEmpty() || read.isNotEmpty()) {
dev.lelonio.square.data.RemoteConnect.describeNext(local + read)
}
diff --git a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
index 6591e59..320f00f 100644
--- a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
@@ -2543,6 +2543,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
/** How the detail screen sorts its tracks; remembered between visits. */
val trackOrders get() = container.preferences.trackOrders
+ val defaultTrackOrder get() = container.preferences.defaultTrackOrder
fun setTrackSort(uri: String?, value: String) {
uri?.let { container.preferences.setTrackSort(it, value) }
diff --git a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
index 00a69ac..e602ee5 100644
--- a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
@@ -1961,9 +1961,9 @@ fun SquareApp(
viewModel.canRemoveFrom(page.uri),
)
},
- storedSort = trackOrders[page.uri]?.sort,
+ storedSort = (trackOrders[page.uri] ?: viewModel.defaultTrackOrder).sort,
onSortChange = { viewModel.setTrackSort(page.uri, it) },
- storedSortDescending = trackOrders[page.uri]?.descending ?: false,
+ storedSortDescending = (trackOrders[page.uri] ?: viewModel.defaultTrackOrder).descending,
onSortDescendingChange = { viewModel.setTrackSortDescending(page.uri, it) },
onOpenItem = { item ->
viewModel.openContext(
diff --git a/native/src/remote.rs b/native/src/remote.rs
index 9ad90b3..8e8209d 100644
--- a/native/src/remote.rs
+++ b/native/src/remote.rs
@@ -43,7 +43,12 @@ pub fn clear() {
}
/// Device registration returns a cluster even when playback has not changed.
+/// Asked only while nothing is stored: every poll used to lock the engine and
+/// copy the whole cluster, only to throw the copy away.
fn seed_initial_cluster() {
+ if CLUSTER.lock().map(|stored| stored.is_some()).unwrap_or(true) {
+ return;
+ }
let Some(initial) = engine::connect_cluster() else { return; };
if let Ok(mut stored) = CLUSTER.lock() {
if stored.is_none() { *stored = Some(initial); }