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.

Check for a new version when the app opens

Lelonio3334c41fa8d5
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 6c69327..d5ad61b 100644
--- a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt
+++ b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt
@@ -84,11 +84,32 @@ class PreferencesStore(context: Context) {
*/
val backendChosen: StateFlow<Boolean> = _backendChosen.asStateFlow()
+ /** When GitHub was last asked about a newer release. See [UpdateChecker]. */
+ fun lastUpdateCheck(): Long = prefs.getLong(KEY_LAST_UPDATE_CHECK, 0L)
+
+ fun setLastUpdateCheck(value: Long) {
+ prefs.edit().putLong(KEY_LAST_UPDATE_CHECK, value).apply()
+ }
+
+ /**
+ * The version the user has already been told about and dismissed.
+ *
+ * One version rather than a set: releases only move forward, so a newer one
+ * than the dismissed one is news again, and an older one cannot appear.
+ */
+ fun skippedUpdate(): String? = prefs.getString(KEY_SKIPPED_UPDATE, null)
+
+ fun setSkippedUpdate(value: String) {
+ prefs.edit().putString(KEY_SKIPPED_UPDATE, value).apply()
+ }
+
private companion object {
const val FILE_NAME = "square_preferences"
const val KEY_TRACK_SORT = "track_sort"
const val KEY_ONBOARDED = "onboarded"
const val KEY_PLAYER_OPEN = "player_open"
const val KEY_BACKEND = "backend"
+ const val KEY_LAST_UPDATE_CHECK = "last_update_check"
+ const val KEY_SKIPPED_UPDATE = "skipped_update"
}
}
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 2b7a48b..f4b274c 100644
--- a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
@@ -34,6 +34,8 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -93,6 +95,8 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.IntOffset
import dev.lelonio.square.ui.components.TrackSheet
import dev.lelonio.square.ui.components.TrackSheetAction
+import dev.lelonio.square.ui.components.UpdateDialog
+import dev.lelonio.square.update.Updater
import dev.lelonio.square.ui.library.openLink
import com.adamglin.phosphoricons.regular.LinkSimple
import com.adamglin.phosphoricons.regular.PencilSimple
@@ -194,6 +198,8 @@ fun SquareApp(
val playlist by viewModel.playlist.collectAsStateWithLifecycle()
val context = LocalContext.current
+ UpdatePrompt()
+
// The session as it was left, so the player has something to draw before
// the media controller connects. Read once, off the saved queue.
val seed = remember(context) { savedPlaybackSeed(context) }
@@ -1364,6 +1370,77 @@ private fun Player.cycleRepeatMode() {
* pre-shuffle one, so the permutation has to be applied to find the track that
* was actually playing.
*/
+/**
+ * Asks GitHub for a newer release when the app opens, and says so if there is one.
+ *
+ * This used to be a button in the settings and nothing else, on the grounds
+ * that the check is a request made for the app's benefit rather than the
+ * user's. The trouble with that is who it leaves behind: an app no store can
+ * reach, whose owner never opens the settings, stays on the version it was
+ * installed with forever, security fixes and all. So it runs on its own now,
+ * with the cost kept small: at most one request every six hours, and one
+ * dialog per release, ever.
+ *
+ * Everything that can go wrong is silence. The check is not something the user
+ * asked for, so a failure is not something to tell them about.
+ */
+@Composable
+private fun UpdatePrompt() {
+ val context = LocalContext.current
+ val updater = remember(context) {
+ (context.applicationContext as dev.lelonio.square.SquareApplication).updater
+ }
+ val prefs = remember(context) { dev.lelonio.square.data.PreferencesStore(context) }
+ val scope = rememberCoroutineScope()
+ val state by updater.state.collectAsStateWithLifecycle()
+
+ LaunchedEffect(Unit) {
+ val now = System.currentTimeMillis()
+ if (now - prefs.lastUpdateCheck() < UPDATE_CHECK_INTERVAL_MS) return@LaunchedEffect
+ // Recorded before the call rather than after it: a phone with no
+ // network would otherwise ask again at every launch, which is the one
+ // shape of this that would be a nuisance.
+ prefs.setLastUpdateCheck(now)
+ runCatching { updater.check() }
+ }
+
+ val available = state as? Updater.State.Available ?: return
+ // Already offered, and turned down. The version is remembered rather than
+ // a flag, so the next release is news again.
+ if (available.version == prefs.skippedUpdate()) return
+
+ // Held across the trip to the system settings, so granting the permission
+ // continues the install instead of dropping it.
+ var pending by remember { mutableStateOf<Updater.State.Available?>(null) }
+ val permission = rememberLauncherForActivityResult(
+ ActivityResultContracts.StartActivityForResult(),
+ ) {
+ val update = pending ?: return@rememberLauncherForActivityResult
+ pending = null
+ scope.launch { if (updater.canInstall()) updater.install(update) }
+ }
+
+ UpdateDialog(
+ version = available.version,
+ size = available.bytes.takeIf { it > 0 }?.let { "%.1f MB".format(it / 1_000_000.0) },
+ onInstall = {
+ prefs.setSkippedUpdate(available.version)
+ scope.launch {
+ if (updater.canInstall()) {
+ updater.install(available)
+ } else {
+ pending = available
+ permission.launch(updater.permissionIntent())
+ }
+ }
+ },
+ onDismiss = { prefs.setSkippedUpdate(available.version) },
+ )
+}
+
+/** At most one check every six hours, however often the app is opened. */
+private const val UPDATE_CHECK_INTERVAL_MS = 6 * 60 * 60 * 1000L
+
private fun savedPlaybackSeed(context: android.content.Context): PlaybackState? {
val saved = dev.lelonio.square.data.PlaybackStore(context).load() ?: return null
val position = saved.shuffleOrder?.getOrNull(saved.index) ?: saved.index
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt b/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt
new file mode 100644
index 0000000..c313862
--- /dev/null
+++ b/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt
@@ -0,0 +1,92 @@
+package dev.lelonio.square.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import dev.lelonio.square.R
+import dev.lelonio.square.ui.theme.Ink
+import dev.lelonio.square.ui.theme.InkDim
+
+/**
+ * Says that a newer build exists, and offers to fetch it.
+ *
+ * An install that no store can reach only learns about a release if something
+ * says so, and the settings row that used to be the only way to find out is a
+ * place nobody visits to check. Shown once per release: dismissing it records
+ * the version, so the same news is never delivered twice.
+ */
+@Composable
+fun UpdateDialog(
+ version: String,
+ /** Download size, already formatted, or null when the release did not say. */
+ size: String?,
+ onInstall: () -> Unit,
+ onDismiss: () -> Unit,
+) {
+ Dialog(onDismissRequest = onDismiss) {
+ Column(
+ Modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(24.dp))
+ .background(DialogFill)
+ .padding(22.dp),
+ ) {
+ Text(
+ stringResource(R.string.update_available, version),
+ style = MaterialTheme.typography.titleMedium,
+ color = Ink,
+ )
+ Text(
+ if (size != null) {
+ stringResource(R.string.update_prompt_size, size)
+ } else {
+ stringResource(R.string.update_prompt)
+ },
+ style = MaterialTheme.typography.bodyMedium,
+ color = InkDim,
+ modifier = Modifier.padding(top = 6.dp),
+ )
+
+ Row(
+ Modifier
+ .padding(top = 20.dp)
+ .fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+ ) {
+ DialogAction(stringResource(R.string.update_later), InkDim, onDismiss)
+ DialogAction(stringResource(R.string.update_install), Ink, onInstall)
+ }
+ }
+ }
+}
+
+@Composable
+private fun DialogAction(label: String, color: Color, onClick: () -> Unit) {
+ Text(
+ label,
+ style = MaterialTheme.typography.bodyLarge,
+ color = color,
+ modifier = Modifier
+ .clip(RoundedCornerShape(50))
+ .clickable(onClick = onClick)
+ .padding(horizontal = 16.dp, vertical = 8.dp),
+ )
+}
+
+/** Opaque, like the other dialogs: nothing behind this is worth refracting. */
+private val DialogFill = Color(0xFF1B1B1B)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9f12629..96525c8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -206,4 +206,8 @@
<string name="delete">Löschen</string>
<string name="playlist_name">Name der Playlist</string>
<string name="create">Erstellen</string>
+ <string name="update_prompt">Jetzt herunterladen und installieren?</string>
+ <string name="update_prompt_size">Jetzt herunterladen und installieren? %1$s.</string>
+ <string name="update_later">Später</string>
+ <string name="update_install">Installieren</string>
</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ba3ee48..dc1a2cc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -206,4 +206,8 @@
<string name="delete">Eliminar</string>
<string name="playlist_name">Nombre de la lista</string>
<string name="create">Crear</string>
+ <string name="update_prompt">¿Descargarlo e instalarlo ahora?</string>
+ <string name="update_prompt_size">¿Descargarlo e instalarlo ahora? %1$s.</string>
+ <string name="update_later">Más tarde</string>
+ <string name="update_install">Instalar</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 668b699..6c1d47b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -206,4 +206,8 @@
<string name="delete">Supprimer</string>
<string name="playlist_name">Nom de la playlist</string>
<string name="create">Créer</string>
+ <string name="update_prompt">La télécharger et l\'installer maintenant ?</string>
+ <string name="update_prompt_size">La télécharger et l\'installer maintenant ? %1$s.</string>
+ <string name="update_later">Plus tard</string>
+ <string name="update_install">Installer</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0948460..f385278 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -207,4 +207,8 @@
<string name="delete">Elimina</string>
<string name="playlist_name">Nome della playlist</string>
<string name="create">Crea</string>
+ <string name="update_prompt">Scaricarlo e installarlo adesso?</string>
+ <string name="update_prompt_size">Scaricarlo e installarlo adesso? %1$s.</string>
+ <string name="update_later">Più tardi</string>
+ <string name="update_install">Installa</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 94dd326..fa95f14 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -206,4 +206,8 @@
<string name="delete">Eliminar</string>
<string name="playlist_name">Nome da playlist</string>
<string name="create">Criar</string>
+ <string name="update_prompt">Transferir e instalar agora?</string>
+ <string name="update_prompt_size">Transferir e instalar agora? %1$s.</string>
+ <string name="update_later">Mais tarde</string>
+ <string name="update_install">Instalar</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46a198f..192e341 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -227,4 +227,8 @@
<string name="delete">Delete</string>
<string name="playlist_name">Playlist name</string>
<string name="create">Create</string>
+ <string name="update_prompt">Download and install it now?</string>
+ <string name="update_prompt_size">Download and install it now? %1$s.</string>
+ <string name="update_later">Later</string>
+ <string name="update_install">Install</string>
</resources>