Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
A diagnostic report from the sign-in: Help on Spotify's page, on the error screen and on a long wait
kota-zo66b3f855fb37
diff --git a/base/app/src/main/java/app/myspoti/MainActivity.kt b/base/app/src/main/java/app/myspoti/MainActivity.ktindex d9f76ca9..8e472a36 100644--- a/base/app/src/main/java/app/myspoti/MainActivity.kt+++ b/base/app/src/main/java/app/myspoti/MainActivity.kt@@ -149,6 +149,8 @@ class MainActivity : AppCompatActivity() {else { loginProblem = false; MyspotiRuntime.host.openLogin() }})load == LoginLoad.LOADING -> ConnectingScreen()+ // On Spotify's page itself: a way to a diagnostic report (the settings are out of reach).+ else -> com.music.spotui.ui.components.LoginHelpButton()}}// Existing users, once, right after the update: the new look, live.@@ -637,6 +639,11 @@ private fun ConnectingScreen() {contentAlignment = androidx.compose.ui.Alignment.Center,) {androidx.compose.material3.CircularProgressIndicator(color = com.music.spotui.ui.theme.AppAccent)+ // Reported: a loading that never ends after the sign-in. Past a long wait, a way to a report.+ var long by androidx.compose.runtime.remember { mutableStateOf(false) }+ androidx.compose.runtime.LaunchedEffect(Unit) { kotlinx.coroutines.delay(12_000); long = true }+ if (long) com.music.spotui.ui.components.LoginReportLink(+ Modifier.align(Alignment.BottomCenter).systemBarsPadding().padding(bottom = 24.dp))}}@@ -660,5 +667,6 @@ private fun LoginProblemScreen(onRetry: () -> Unit) {Text(stringResource(R.string.retry_button), color = Color.Black, fontFamily = com.music.spotui.ui.theme.AppSans,fontWeight = FontWeight.Bold, fontSize = 17.sp)}+ com.music.spotui.ui.components.LoginReportLink(Modifier.padding(top = 12.dp))}}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/LoginHelp.kt b/base/app/src/main/java/com/music/spotui/ui/components/LoginHelp.ktnew file mode 100644index 00000000..870cbf39--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/ui/components/LoginHelp.kt@@ -0,0 +1,102 @@+package com.music.spotui.ui.components++import androidx.compose.foundation.background+import androidx.compose.foundation.clickable+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.statusBars+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.material3.AlertDialog+import androidx.compose.material3.Text+import androidx.compose.material3.TextButton+import androidx.compose.runtime.Composable+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.setValue+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.platform.LocalContext+import androidx.compose.ui.platform.LocalDensity+import androidx.compose.ui.res.stringResource+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.unit.IntOffset+import androidx.compose.ui.unit.dp+import androidx.compose.ui.unit.sp+import androidx.compose.ui.window.Popup+import app.myspoti.engine.R+import app.myspoti.host.android.Logbook+import app.myspoti.host.android.MyspotiRuntime+import com.music.spotui.ui.screens.shareDiagnosticReport+import com.music.spotui.ui.theme.AppAccent+import com.music.spotui.ui.theme.AppSans+import com.music.spotui.ui.theme.AppText++/**+ * A failed sign-in had no way to a diagnostic report: the export lives in the settings, which+ * only a signed-in app reaches (the reported "Oops! Something went wrong" and e-mail loops came+ * with no log at all). What the page shows is noted first, then the usual share sheet.+ */+fun sendLoginReport(context: android.content.Context) {+ MyspotiRuntime.host.noteLoginPage {+ val file = runCatching { Logbook.export(context) }.getOrNull()+ if (file != null) shareDiagnosticReport(context, file)+ else android.widget.Toast.makeText(context, context.getString(R.string.diagnostic_export_failed), android.widget.Toast.LENGTH_SHORT).show()+ }+}++/**+ * "Help" over Spotify's sign-in page. The page is a WebView above the app's screens, so this is a+ * popup (a window of its own, above it), small, in the top corner Spotify's page leaves empty, and+ * not focusable: the keyboard and the form keep working under it.+ */+@Composable+fun LoginHelpButton() {+ var open by remember { mutableStateOf(false) }+ val top = WindowInsets.statusBars.getTop(LocalDensity.current)+ val gap = with(LocalDensity.current) { 12.dp.roundToPx() }+ Popup(alignment = Alignment.TopEnd, offset = IntOffset(-gap, top + gap)) {+ Text(+ stringResource(R.string.login_help_button),+ color = AppText, fontFamily = AppSans, fontWeight = FontWeight.Bold, fontSize = 13.sp,+ modifier = Modifier.clip(RoundedCornerShape(50)).background(Color(0xCC2A2A2A))+ .clickable { open = true }.padding(horizontal = 14.dp, vertical = 7.dp),+ )+ }+ if (open) LoginHelpDialog(onClose = { open = false })+}++@Composable+fun LoginHelpDialog(onClose: () -> Unit) {+ val ctx = LocalContext.current+ AlertDialog(+ onDismissRequest = onClose,+ containerColor = Color(0xFF242424),+ title = { Text(stringResource(R.string.login_help_title), color = AppText) },+ text = { Text(stringResource(R.string.login_help_detail), color = AppText.copy(alpha = 0.7f)) },+ confirmButton = {+ TextButton(onClick = { onClose(); sendLoginReport(ctx) }) {+ Text(stringResource(R.string.login_help_send), color = AppAccent)+ }+ },+ dismissButton = {+ // A half-finished flow is what Spotify answers "Oops! Something went wrong" to: from nothing.+ TextButton(onClick = { onClose(); MyspotiRuntime.host.retryLogin() }) {+ Text(stringResource(R.string.login_help_restart), color = AppText)+ }+ },+ )+}++/** Under a wait that lasts (the loading screen after the sign-in), the same way to a report. */+@Composable+fun LoginReportLink(modifier: Modifier = Modifier) {+ val ctx = LocalContext.current+ Text(+ stringResource(R.string.login_help_slow),+ color = AppText.copy(alpha = 0.6f), fontFamily = AppSans, fontSize = 14.sp,+ modifier = modifier.clip(RoundedCornerShape(50)).clickable { sendLoginReport(ctx) }.padding(horizontal = 14.dp, vertical = 10.dp),+ )+}diff --git a/base/app/src/main/res/values-de/myspoti_strings.xml b/base/app/src/main/res/values-de/myspoti_strings.xmlindex cc562099..b1e4f0c1 100644--- a/base/app/src/main/res/values-de/myspoti_strings.xml+++ b/base/app/src/main/res/values-de/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">Eine Benachrichtigung, wenn ein Künstler, dem du folgst, etwas veröffentlicht; alle paar Stunden geprüft, solange Myspoti läuft</string><string name="quality_streaming_very_high">Sehr hoch</string><string name="quality_streaming_very_high_detail">256 kbit/s, nur für Premium-Konten</string>+ <string name="login_help_button">Hilfe</string>+ <string name="login_help_title">Probleme bei der Anmeldung?</string>+ <string name="login_help_detail">Der Diagnosebericht zeigt, bei welchem Schritt die Anmeldung hängt. Er enthält weder dein Passwort noch deine E-Mail.</string>+ <string name="login_help_send">Bericht senden</string>+ <string name="login_help_restart">Neu beginnen</string>+ <string name="login_help_slow">Dauert es zu lange? Diagnosebericht senden</string></resources>diff --git a/base/app/src/main/res/values-el/myspoti_strings.xml b/base/app/src/main/res/values-el/myspoti_strings.xmlindex a5173a7e..4914e8fb 100644--- a/base/app/src/main/res/values-el/myspoti_strings.xml+++ b/base/app/src/main/res/values-el/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">Μια ειδοποίηση όταν ένας καλλιτέχνης που ακολουθείς κυκλοφορεί κάτι, με έλεγχο κάθε λίγες ώρες όσο τρέχει το Myspoti</string><string name="quality_streaming_very_high">Πολύ υψηλή</string><string name="quality_streaming_very_high_detail">256 kbit/s, μόνο για λογαριασμούς Premium</string>+ <string name="login_help_button">Βοήθεια</string>+ <string name="login_help_title">Πρόβλημα με τη σύνδεση;</string>+ <string name="login_help_detail">Η αναφορά διάγνωσης δείχνει σε ποιο βήμα κολλάει η σύνδεση. Δεν περιέχει ούτε τον κωδικό σου ούτε το e-mail σου.</string>+ <string name="login_help_send">Αποστολή αναφοράς</string>+ <string name="login_help_restart">Από την αρχή</string>+ <string name="login_help_slow">Αργεί πολύ; Στείλε αναφορά διάγνωσης</string></resources>diff --git a/base/app/src/main/res/values-es/myspoti_strings.xml b/base/app/src/main/res/values-es/myspoti_strings.xmlindex df470f56..fea115e8 100644--- a/base/app/src/main/res/values-es/myspoti_strings.xml+++ b/base/app/src/main/res/values-es/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">Una notificación cuando un artista que sigues publica algo, comprobado cada pocas horas mientras Myspoti está abierto</string><string name="quality_streaming_very_high">Muy alta</string><string name="quality_streaming_very_high_detail">256 kbit/s, solo cuentas Premium</string>+ <string name="login_help_button">Ayuda</string>+ <string name="login_help_title">¿Problemas para iniciar sesión?</string>+ <string name="login_help_detail">El informe de diagnóstico muestra en qué paso se atasca el inicio de sesión. No contiene ni tu contraseña ni tu correo.</string>+ <string name="login_help_send">Enviar el informe</string>+ <string name="login_help_restart">Empezar de nuevo</string>+ <string name="login_help_slow">¿Tarda demasiado? Enviar un informe de diagnóstico</string></resources>diff --git a/base/app/src/main/res/values-fr/myspoti_strings.xml b/base/app/src/main/res/values-fr/myspoti_strings.xmlindex 7f91efc4..9c6727f1 100644--- a/base/app/src/main/res/values-fr/myspoti_strings.xml+++ b/base/app/src/main/res/values-fr/myspoti_strings.xml@@ -776,4 +776,10 @@<string name="settings_release_notify_detail">Une notification quand un artiste que tu suis sort quelque chose, vérifié toutes les quelques heures pendant que Myspoti tourne</string><string name="quality_streaming_very_high">Très élevée</string><string name="quality_streaming_very_high_detail">256 kbit/s, comptes Premium uniquement</string>+ <string name="login_help_button">Aide</string>+ <string name="login_help_title">Un souci pour te connecter ?</string>+ <string name="login_help_detail">Le rapport de diagnostic montre à quelle étape la connexion bloque. Il ne contient ni ton mot de passe ni ton e-mail.</string>+ <string name="login_help_send">Envoyer le rapport</string>+ <string name="login_help_restart">Recommencer</string>+ <string name="login_help_slow">Ça prend trop de temps ? Envoyer un rapport de diagnostic</string></resources>diff --git a/base/app/src/main/res/values-it/myspoti_strings.xml b/base/app/src/main/res/values-it/myspoti_strings.xmlindex 29484f1f..453dc654 100644--- a/base/app/src/main/res/values-it/myspoti_strings.xml+++ b/base/app/src/main/res/values-it/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">Una notifica quando un artista che segui pubblica qualcosa, controllato ogni poche ore mentre Myspoti è attivo</string><string name="quality_streaming_very_high">Molto alta</string><string name="quality_streaming_very_high_detail">256 kbit/s, solo account Premium</string>+ <string name="login_help_button">Aiuto</string>+ <string name="login_help_title">Problemi ad accedere?</string>+ <string name="login_help_detail">Il rapporto di diagnostica mostra a quale passaggio si blocca l\'accesso. Non contiene né la tua password né la tua e-mail.</string>+ <string name="login_help_send">Invia il rapporto</string>+ <string name="login_help_restart">Ricomincia</string>+ <string name="login_help_slow">Ci vuole troppo? Invia un rapporto di diagnostica</string></resources>diff --git a/base/app/src/main/res/values-pl/myspoti_strings.xml b/base/app/src/main/res/values-pl/myspoti_strings.xmlindex f75130c0..973058d3 100644--- a/base/app/src/main/res/values-pl/myspoti_strings.xml+++ b/base/app/src/main/res/values-pl/myspoti_strings.xml@@ -786,4 +786,10 @@<string name="settings_release_notify_detail">Powiadomienie, gdy obserwowany artysta coś wyda; sprawdzane co kilka godzin, gdy Myspoti działa</string><string name="quality_streaming_very_high">Bardzo wysoka</string><string name="quality_streaming_very_high_detail">256 kbit/s, tylko konta Premium</string>+ <string name="login_help_button">Pomoc</string>+ <string name="login_help_title">Problem z logowaniem?</string>+ <string name="login_help_detail">Raport diagnostyczny pokazuje, na którym etapie logowanie się zatrzymuje. Nie zawiera ani hasła, ani adresu e-mail.</string>+ <string name="login_help_send">Wyślij raport</string>+ <string name="login_help_restart">Zacznij od nowa</string>+ <string name="login_help_slow">Trwa to za długo? Wyślij raport diagnostyczny</string></resources>diff --git a/base/app/src/main/res/values-pt-rBR/myspoti_strings.xml b/base/app/src/main/res/values-pt-rBR/myspoti_strings.xmlindex 069ca300..8a5d7208 100644--- a/base/app/src/main/res/values-pt-rBR/myspoti_strings.xml+++ b/base/app/src/main/res/values-pt-rBR/myspoti_strings.xml@@ -750,4 +750,10 @@<string name="settings_release_notify_detail">Uma notificação quando um artista que você segue lança algo, verificado a cada poucas horas enquanto o Myspoti está aberto</string><string name="quality_streaming_very_high">Muito alta</string><string name="quality_streaming_very_high_detail">256 kbit/s, apenas contas Premium</string>+ <string name="login_help_button">Ajuda</string>+ <string name="login_help_title">Problemas para entrar?</string>+ <string name="login_help_detail">O relatório de diagnóstico mostra em qual etapa o login trava. Ele não contém sua senha nem seu e-mail.</string>+ <string name="login_help_send">Enviar o relatório</string>+ <string name="login_help_restart">Começar de novo</string>+ <string name="login_help_slow">Demorando demais? Enviar um relatório de diagnóstico</string></resources>diff --git a/base/app/src/main/res/values-pt-rPT/myspoti_strings.xml b/base/app/src/main/res/values-pt-rPT/myspoti_strings.xmlindex ead45bb7..46cb764d 100644--- a/base/app/src/main/res/values-pt-rPT/myspoti_strings.xml+++ b/base/app/src/main/res/values-pt-rPT/myspoti_strings.xml@@ -717,4 +717,10 @@<string name="settings_release_notify_detail">Uma notificação quando um artista que segues lança algo, verificado a cada poucas horas enquanto o Myspoti está aberto</string><string name="quality_streaming_very_high">Muito alta</string><string name="quality_streaming_very_high_detail">256 kbit/s, só contas Premium</string>+ <string name="login_help_button">Ajuda</string>+ <string name="login_help_title">Problemas a iniciar sessão?</string>+ <string name="login_help_detail">O relatório de diagnóstico mostra em que passo o início de sessão fica preso. Não contém a tua palavra-passe nem o teu e-mail.</string>+ <string name="login_help_send">Enviar o relatório</string>+ <string name="login_help_restart">Recomeçar</string>+ <string name="login_help_slow">Está a demorar? Enviar um relatório de diagnóstico</string></resources>diff --git a/base/app/src/main/res/values-pt/myspoti_strings.xml b/base/app/src/main/res/values-pt/myspoti_strings.xmlindex 7beb5a30..db46f2e2 100644--- a/base/app/src/main/res/values-pt/myspoti_strings.xml+++ b/base/app/src/main/res/values-pt/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">Uma notificação quando um artista que segues lança algo, verificado a cada poucas horas enquanto o Myspoti está aberto</string><string name="quality_streaming_very_high">Muito alta</string><string name="quality_streaming_very_high_detail">256 kbit/s, só contas Premium</string>+ <string name="login_help_button">Ajuda</string>+ <string name="login_help_title">Problemas para entrar?</string>+ <string name="login_help_detail">O relatório de diagnóstico mostra em qual etapa o login trava. Ele não contém sua senha nem seu e-mail.</string>+ <string name="login_help_send">Enviar o relatório</string>+ <string name="login_help_restart">Começar de novo</string>+ <string name="login_help_slow">Demorando demais? Enviar um relatório de diagnóstico</string></resources>diff --git a/base/app/src/main/res/values-ru/myspoti_strings.xml b/base/app/src/main/res/values-ru/myspoti_strings.xmlindex bc3f1001..b017bdca 100644--- a/base/app/src/main/res/values-ru/myspoti_strings.xml+++ b/base/app/src/main/res/values-ru/myspoti_strings.xml@@ -786,4 +786,10 @@<string name="settings_release_notify_detail">Уведомление, когда артист, на которого вы подписаны, что-то выпускает; проверка каждые несколько часов, пока Myspoti работает</string><string name="quality_streaming_very_high">Очень высокое</string><string name="quality_streaming_very_high_detail">256 кбит/с, только для Premium</string>+ <string name="login_help_button">Помощь</string>+ <string name="login_help_title">Не получается войти?</string>+ <string name="login_help_detail">Диагностический отчёт показывает, на каком шаге застревает вход. В нём нет ни пароля, ни e-mail.</string>+ <string name="login_help_send">Отправить отчёт</string>+ <string name="login_help_restart">Начать заново</string>+ <string name="login_help_slow">Слишком долго? Отправить диагностический отчёт</string></resources>diff --git a/base/app/src/main/res/values-zh/myspoti_strings.xml b/base/app/src/main/res/values-zh/myspoti_strings.xmlindex aadbcadc..c93c971d 100644--- a/base/app/src/main/res/values-zh/myspoti_strings.xml+++ b/base/app/src/main/res/values-zh/myspoti_strings.xml@@ -771,4 +771,10 @@<string name="settings_release_notify_detail">你关注的艺人发布新作品时发送通知,Myspoti 运行时每隔几小时检查一次</string><string name="quality_streaming_very_high">极高</string><string name="quality_streaming_very_high_detail">256 kbit/s,仅限 Premium 账户</string>+ <string name="login_help_button">帮助</string>+ <string name="login_help_title">登录遇到问题?</string>+ <string name="login_help_detail">诊断报告会显示登录卡在哪一步。报告中不包含你的密码和邮箱。</string>+ <string name="login_help_send">发送报告</string>+ <string name="login_help_restart">重新开始</string>+ <string name="login_help_slow">等太久了?发送诊断报告</string></resources>diff --git a/base/app/src/main/res/values/myspoti_strings.xml b/base/app/src/main/res/values/myspoti_strings.xmlindex 188156b8..76f4821a 100644--- a/base/app/src/main/res/values/myspoti_strings.xml+++ b/base/app/src/main/res/values/myspoti_strings.xml@@ -778,4 +778,10 @@<string name="settings_release_notify_detail">A notification when an artist you follow releases something, checked every few hours while Myspoti runs</string><string name="quality_streaming_very_high">Very high</string><string name="quality_streaming_very_high_detail">256 kbit/s, Premium accounts only</string>+ <string name="login_help_button">Help</string>+ <string name="login_help_title">Trouble signing in?</string>+ <string name="login_help_detail">The diagnostic report shows at which step the sign-in gets stuck. It contains neither your password nor your e-mail.</string>+ <string name="login_help_send">Send the report</string>+ <string name="login_help_restart">Start over</string>+ <string name="login_help_slow">Taking too long? Send a diagnostic report</string></resources>diff --git a/base/host-android/src/main/kotlin/app/myspoti/host/android/WebPlayerHost.kt b/base/host-android/src/main/kotlin/app/myspoti/host/android/WebPlayerHost.ktindex a3a278c3..1d33ef89 100644--- a/base/host-android/src/main/kotlin/app/myspoti/host/android/WebPlayerHost.kt+++ b/base/host-android/src/main/kotlin/app/myspoti/host/android/WebPlayerHost.kt@@ -652,6 +652,26 @@ class WebPlayerHost(private val context: Context) : BridgeHost {*/fun retryLogin() = main.post { beginLoginLoad(); cleanSlate { view.loadUrl(LOGIN_URL) } }+ /**+ * Before a report sent from the sign-in: what the page shows right now (its path, title, the+ * error messages on it, which kind of step), into the log. The failed sign-ins reported+ * ("Oops! Something went wrong", an e-mail not recognised, a page that loads for ever) came+ * with no trail of the page itself. Typed values are never read; e-mails are masked by the log.+ * [done] runs on the main thread, after the answer or 1.5 s.+ */+ fun noteLoginPage(done: () -> Unit) = main.post {+ var finished = false+ val finish = { if (!finished) { finished = true; done() } }+ val url = _url.value+ Logbook.log("report asked from the sign-in: ${Logbook.noQuery(url).take(120)} load=${_loginLoad.value} steps=$loginSteps")+ if (!isLoginPage(url) && !LoginLoad.isSpotifyAccounts(url)) { finish(); return@post }+ main.postDelayed({ finish() }, 1_500)+ view.evaluateJavascript(LOGIN_PAGE_STATE_JS) { answer ->+ Logbook.log("sign-in page now: ${answer?.take(600)}")+ finish()+ }+ }+private fun cleanSlate(then: () -> Unit) {cookies().removeAllCookies {main.post {@@ -948,6 +968,22 @@ class WebPlayerHost(private val context: Context) : BridgeHost {private const val PURGE_RETRY_MS = 10_000Lprivate const val LOAD_RETRIES = 4const val LOGIN_URL = "https://accounts.spotify.com/login?continue=https%3A%2F%2Fopen.spotify.com%2F"++ /**+ * What the sign-in page shows, for [noteLoginPage]: path, title, first heading, the text of its+ * alerts and error banners, and which fields are there (by type, never their values).+ */+ private const val LOGIN_PAGE_STATE_JS = """(function(){try{+var t=function(e){return (e.innerText||'').replace(/\s+/g,' ').trim().slice(0,160)};+var seen={},msgs=[];+document.querySelectorAll('[role=alert],[aria-live],[data-encore-id*=anner],[class*=rror],[class*=anner],[id*=rror]').forEach(function(e){+var s=t(e); if(s&&!seen[s]&&msgs.length<6){seen[s]=1;msgs.push(s)}});+var f=[]; document.querySelectorAll('input').forEach(function(i){if(i.type!=='hidden')f.push(i.type+(i.autocomplete?'/'+i.autocomplete:''))});+var h=document.querySelector('h1,h2');+return JSON.stringify({path:location.host+location.pathname,title:document.title.slice(0,80),heading:h?t(h):null,+messages:msgs,fields:f.slice(0,8),captcha:!!document.querySelector('iframe[src*=captcha],iframe[src*=challenge],[class*=aptcha]'),+ready:document.readyState});+}catch(e){return 'failed: '+e}})()"""}}