From 6855dd4467533f7568b042c539e199e8f23eb030 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 08:43:54 -0400 Subject: [PATCH] fix(xbox): say to sign in again when Microsoft rejects the download's licenses --- .../launcher/stores/xbox/XboxInstaller.kt | 8 +++++++- .../droiddeck/launcher/stores/xbox/Xodus.kt | 4 +++- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../stores/xbox/XodusDiagnosticsTest.kt | 19 +++++++++++++++++++ 36 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt index 296ff050b8..3d02e4db57 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt @@ -44,7 +44,12 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market, "--progress-json", "--control-stdin") + selection).use { process -> child = process - val diagnostics = Xodus.diagnostics(process) + val rejected = AtomicBoolean(false) + val rejectedLine = Regex(Xodus.SIGN_IN_REJECTED) + val diagnostics = Xodus.diagnostics(process) { line -> + StoresState.logLine("Xbox: $line") + if (line.matches(rejectedLine)) rejected.set(true) + } if (cancelled.get()) process.process.destroy() process.process.inputStream.bufferedReader().useLines { lines -> lines.forEach { line -> if (line.startsWith("NEXUS_PROGRESS ")) { @@ -63,6 +68,7 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog check(process.process.waitFor(15, TimeUnit.SECONDS)) { "Xbox installer did not exit." } diagnostics.join(2000) if (cancelled.get()) return null + check(!rejected.get()) { app.getString(com.droiddeck.launcher.R.string.stores_xbox_sign_in_again) } check(process.process.exitValue() == 0 && complete) { "Xbox download did not complete. Resume to retry with fresh licenses." } } if (content) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index 94b8138253..51bb3c714a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -150,11 +150,13 @@ internal object Xodus { } } + const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP [0-9]{3}\\)\\. Sign in again in Settings\\." + /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({ runCatching { child.process.errorStream.bufferedReader().useLines { lines -> lines.forEach { line -> - if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\."))) + if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.|NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{3}|$SIGN_IN_REJECTED"))) report(line) } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 932827b750..07212eeae1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2242,6 +2242,7 @@ إغلاق حاوِل مرة أخرى جارٍ إنهاء تسجيل الدخول… + رفضت Microsoft تسجيل الدخول إلى Xbox. سجّل الخروج من Xbox في المتاجر، ثم سجّل الدخول مجددًا، ثم استأنف. تعذّر تحميل صفحة تسجيل الدخول: %1$s يرفض هذا المزوّد تسجيل الدخول من صفحة مضمَّنة. سجِّل الدخول باستخدام كلمة مرور المتجر بدلاً من ذلك. استجابت صفحة تسجيل الدخول بخطأ (HTTP %1$d). diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 411747242c..8c795fcc2b 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2194,6 +2194,7 @@ Cerrar Reintentar Terminando de iniciar sesión… + Microsoft rechazó el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y luego reanuda. No se pudo cargar la página de inicio de sesión: %1$s Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda. La página de inicio de sesión respondió con un error (HTTP %1$d). diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6eab6e3e52..191e0254cd 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2158,6 +2158,7 @@ Затвори Опитай отново Завършване на входа… + Microsoft отхвърли входа в Xbox. Излезте от Xbox в Магазини, влезте отново и след това продължете. Страницата за вход не можа да се зареди: %1$s Този доставчик отказва вход от вградена страница. Впиши се с паролата си за магазина. Страницата за вход отговори с грешка (HTTP %1$d). diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ae2a289530..f183eb12ac 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2200,6 +2200,7 @@ Zavřít Zkusit znovu Dokončování přihlášení… + Microsoft odmítl přihlášení k Xboxu. V Obchodech se z Xboxu odhlaste, znovu se přihlaste a pak pokračujte. Přihlašovací stránku se nepodařilo načíst: %1$s Tento poskytovatel odmítá přihlášení ze vložené stránky. Přihlaste se místo toho heslem k obchodu. Přihlašovací stránka odpověděla chybou (HTTP %1$d). diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 98d0bca466..48c47c1776 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2158,6 +2158,7 @@ Luk Forsøg igen Afslutter login… + Microsoft afviste Xbox-login. Log ud af Xbox under Butikker, log ind igen, og genoptag derefter. Loginsiden kunne ikke indlæses: %1$s Denne udbyder afviser login fra en indlejret side. Log i stedet ind med din butikskodeord. Loginsiden svarede med en fejl (HTTP %1$d). diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1b0ae75cdf..6613633fe9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2147,6 +2147,7 @@ Schließen Erneut versuchen Anmeldung wird abgeschlossen… + Microsoft hat die Xbox-Anmeldung abgelehnt. Melde dich unter Stores von Xbox ab, melde dich erneut an und setze dann fort. Die Anmeldeseite konnte nicht geladen werden: %1$s Dieser Anbieter lässt keine Anmeldung über eine eingebettete Seite zu. Melde dich stattdessen mit deinem Store-Passwort an. Die Anmeldeseite antwortete mit einem Fehler (HTTP %1$d). diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 709eb2244f..c65a0da054 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2158,6 +2158,7 @@ Κλείσιμο Δοκιμάστε ξανά Ολοκλήρωση σύνδεσης… + Η Microsoft απέρριψε τη σύνδεση στο Xbox. Αποσυνδεθείτε από το Xbox στα Καταστήματα, συνδεθείτε ξανά και μετά συνεχίστε. Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης: %1$s Αυτός ο πάροχος αρνείται να συνδεθεί από μια ενσωματωμένη σελίδα. Συνδεθείτε με τον κωδικό πρόσβασης του καταστήματός σας αντ\' αυτού. Η σελίδα σύνδεσης απάντησε με σφάλμα (HTTP %1$d). diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38019dade7..e0faa4ec1b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2178,6 +2178,7 @@ Cerrar Reintentar Terminando de iniciar sesión… + Microsoft ha rechazado el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y reanuda. No se pudo cargar la página de inicio de sesión: %1$s Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda. La página de inicio de sesión respondió con un error (HTTP %1$d). diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6aafc85b61..5cfb6fdae5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2158,6 +2158,7 @@ Sulje Yritä uudelleen Viimeistellään kirjautumista… + Microsoft hylkäsi Xbox-kirjautumisen. Kirjaudu ulos Xboxista Kaupoissa, kirjaudu uudelleen sisään ja jatka sitten. Kirjautumissivua ei voitu latata: %1$s Tämä palveluntarjoaja ei salli kirjautumista upotetulta sivulta. Kirjaudu sisään kaupan salasanalla sen sijaan. Kirjautumissivu vastasi virheellä (HTTP %1$d). diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f345150b61..1cd1c9be5b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2178,6 +2178,7 @@ Fermer Réessayer Finalisation de la connexion… + Microsoft a refusé la connexion Xbox. Déconnectez-vous de Xbox dans Boutiques, reconnectez-vous, puis reprenez. Impossible de charger la page de connexion : %1$s Ce fournisseur refuse la connexion depuis une page intégrée. Connectez-vous plutôt avec le mot de passe de la boutique. La page de connexion a renvoyé une erreur (HTTP %1$d). diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d74e5c0d63..c30f55bd8b 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2158,6 +2158,7 @@ बंद करें फिर कोशिश करें साइन-इन पूरा हो रहा है… + Microsoft ने Xbox साइन-इन अस्वीकार कर दिया। स्टोर्स में Xbox से साइन आउट करें, फिर से साइन इन करें, फिर जारी रखें। साइन-इन पेज लोड नहीं हो सका: %1$s यह प्रोवाइडर एम्बेडेड पेज से साइन इन करने से मना करता है। इसके बदले अपने स्टोर पासवर्ड से साइन इन करें। साइन-इन पेज ने एक एरर के साथ जवाब दिया (HTTP %1$d)। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e8571e4927..2d54db9ada 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2158,6 +2158,7 @@ Bezárás Próbálja újra A bejelentkezés befejezése… + A Microsoft elutasította az Xbox-bejelentkezést. Az Áruházakban jelentkezz ki az Xboxból, jelentkezz be újra, majd folytasd. Nem sikerült betölteni a bejelentkezési oldalt: %1$s Ez a szolgáltató nem engedi a bejelentkezést egy beágyazott oldalról. Jelentkezzen be helyette az áruház jelszavával. A bejelentkezési oldal hibával válaszolt (HTTP %1$d). diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 80927811f0..ac15bce259 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2137,6 +2137,7 @@ Tutup Coba lagi Menyelesaikan proses masuk… + Microsoft menolak masuk Xbox. Keluar dari Xbox di Toko, masuk lagi, lalu lanjutkan. Halaman masuk tidak dapat dimuat: %1$s Penyedia ini menolak proses masuk dari halaman tersemat. Masuk dengan kata sandi toko Anda sebagai gantinya. Halaman masuk merespons dengan kesalahan (HTTP %1$d). diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5aa836ade..db64b04afc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2168,6 +2168,7 @@ Chiudi Riprova Completamento dell\'accesso… + Microsoft ha rifiutato l\'accesso a Xbox. Esci da Xbox in Negozi, accedi di nuovo, poi riprendi. Impossibile caricare la pagina di accesso: %1$s Questo provider non consente l\'accesso da una pagina incorporata. Accedi invece con la password del negozio. La pagina di accesso ha risposto con un errore (HTTP %1$d). diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 03e8ae2002..5cd48e61c1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2139,6 +2139,7 @@ 閉じる 再試行 ログインを完了しています… + Microsoft が Xbox のサインインを拒否しました。ストアで Xbox からサインアウトし、もう一度サインインしてから再開してください。 ログインページを読み込めませんでした:%1$s このプロバイダーは埋め込みページからのログインを拒否しています。代わりにストアのパスワードでログインしてください。 ログインページがエラーを返しました(HTTP %1$d)。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5096684e2c..2f52cf77ea 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2139,6 +2139,7 @@ 닫기 다시 시도 로그인 완료 중… + Microsoft에서 Xbox 로그인을 거부했습니다. 스토어에서 Xbox 로그아웃 후 다시 로그인한 다음 재개하세요. 로그인 페이지를 불러올 수 없습니다: %1$s 이 제공업체는 앱에 포함된 페이지에서 로그인을 허용하지 않습니다. 대신 스토어 비밀번호로 로그인하세요. 로그인 페이지에서 오류를 반환했습니다(HTTP %1$d). diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 82f9e7b2c2..b6c533da91 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2137,6 +2137,7 @@ Tutup Cuba lagi Menyelesaikan log masuk… + Microsoft menolak log masuk Xbox. Log keluar daripada Xbox di Kedai, log masuk semula, kemudian sambung. Halaman log masuk tidak dapat dimuatkan: %1$s Penyedia ini menolak log masuk daripada halaman terbenam. Log masuk dengan kata laluan kedai anda sebaliknya. Halaman log masuk menjawab dengan ralat (HTTP %1$d). diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index af48f21a98..10ee3fea0d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2158,6 +2158,7 @@ Lukk Prøv igjen Fullfører innlogging… + Microsoft avviste Xbox-påloggingen. Logg ut av Xbox under Butikker, logg på igjen, og fortsett deretter. Innloggingssiden kunne ikke lastes: %1$s Denne leverandøren tillater ikke innlogging fra en innebygd side. Logg inn med butikkpassordet ditt i stedet. Innloggingssiden svarte med en feil (HTTP %1$d). diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d591de6ddf..866d126333 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2158,6 +2158,7 @@ Sluiten Probeer het opnieuw Aanmelden afronden… + Microsoft heeft de Xbox-aanmelding geweigerd. Meld je af bij Xbox in Winkels, meld je opnieuw aan en hervat daarna. De aanmeldpagina kon niet worden geladen: %1$s Deze provider staat geen aanmelding via een ingesloten pagina toe. Meld je in plaats daarvan aan met je winkelwachtwoord. De aanmeldpagina gaf een foutmelding (HTTP %1$d). diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b1cdccf7be..774f207d49 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2203,6 +2203,7 @@ Zamknij Spróbuj ponownie Kończenie logowania… + Microsoft odrzucił logowanie do Xbox. Wyloguj się z Xbox w Sklepach, zaloguj się ponownie, a potem wznów. Nie udało się wczytać strony logowania: %1$s Ten dostawca odmawia logowania z osadzonej strony. Zaloguj się za pomocą hasła do sklepu. Strona logowania odpowiedziała błędem (HTTP %1$d). diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0d5d739f32..26ec662c27 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2168,6 +2168,7 @@ Fechar Tentar novamente A concluir o início de sessão… + A Microsoft recusou o início de sessão da Xbox. Termine a sessão da Xbox em Lojas, inicie sessão novamente e retome. Não foi possível carregar a página de início de sessão: %1$s Este fornecedor recusa o início de sessão a partir de uma página incorporada. Inicie sessão com a palavra-passe da loja. A página de início de sessão respondeu com um erro (HTTP %1$d). diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3e5cd06e73..e45878dc95 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2168,6 +2168,7 @@ Fechar Tentar de novo Concluindo o login… + A Microsoft recusou o login do Xbox. Saia do Xbox em Lojas, entre novamente e depois retome. Não foi possível carregar a página de login: %1$s Este provedor não permite login a partir de uma página incorporada. Faça login com a senha da loja. A página de login respondeu com um erro (HTTP %1$d). diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 60f025f872..997fd9352b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2179,6 +2179,7 @@ Închide Încearcă din nou Se finalizează autentificarea… + Microsoft a respins conectarea la Xbox. Deconectează-te de la Xbox în Magazine, conectează-te din nou, apoi reia. Pagina de autentificare nu a putut fi încărcată: %1$s Acest furnizor refuză autentificarea dintr-o pagină încorporată. Autentifică-te cu parola magazinului în schimb. Pagina de autentificare a răspuns cu o eroare (HTTP %1$d). diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 39582774ca..fb845b999b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2199,6 +2199,7 @@ Закрыть Повторить Завершение входа… + Microsoft отклонила вход в Xbox. Выйдите из Xbox в разделе «Магазины», войдите снова и продолжите. Не удалось загрузить страницу входа: %1$s Этот сервис не разрешает вход со встроенной страницы. Войдите с паролем от магазина. Страница входа вернула ошибку (HTTP %1$d). diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d245c20a00..f4cf34256c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2158,6 +2158,7 @@ Stäng Försök igen Slutför inloggningen… + Microsoft avvisade Xbox-inloggningen. Logga ut från Xbox under Butiker, logga in igen och återuppta sedan. Inloggningssidan kunde inte läsas in: %1$s Den här leverantören vägrar logga in från en inbäddad sida. Logga in med ditt butikslösenord istället. Inloggningssidan svarade med ett fel (HTTP %1$d). diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ae74b6e9f3..1d998b751d 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2137,6 +2137,7 @@ ปิด ลองใหม่ กำลังเสร็จสิ้นการลงชื่อเข้าใช้… + Microsoft ปฏิเสธการลงชื่อเข้าใช้ Xbox ลงชื่อออกจาก Xbox ในสโตร์ ลงชื่อเข้าใช้อีกครั้ง แล้วดำเนินการต่อ ไม่สามารถโหลดหน้าลงชื่อเข้าใช้ได้: %1$s ผู้ให้บริการนี้ปฏิเสธการลงชื่อเข้าใช้จากหน้าที่ฝังอยู่ ให้ลงชื่อเข้าใช้ด้วยรหัสผ่านของสโตร์แทน หน้าลงชื่อเข้าใช้ตอบกลับด้วยข้อผิดพลาด (HTTP %1$d) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 146f57d80c..fdd392dd94 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2149,6 +2149,7 @@ Kapat Yeniden dene Oturum açma tamamlanıyor… + Microsoft, Xbox oturum açmayı reddetti. Mağazalar\'da Xbox oturumunu kapatın, yeniden oturum açın ve devam edin. Oturum açma sayfası yüklenemedi: %1$s Bu sağlayıcı yerleşik bir sayfadan oturum açmayı reddediyor. Bunun yerine mağaza parolanızla oturum açın. Oturum açma sayfası bir hatayla yanıt verdi (HTTP %1$d). diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5b8bfd4c43..bb5d65d254 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2200,6 +2200,7 @@ Закрити Спробувати ще раз Завершення входу… + Microsoft відхилила вхід у Xbox. Вийдіть з Xbox у розділі «Магазини», увійдіть знову й продовжте. Не вдалося завантажити сторінку входу: %1$s Цей провайдер не дозволяє вхід із вбудованої сторінки. Увійдіть за допомогою пароля магазину. Сторінка входу відповіла помилкою (HTTP %1$d). diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3effbb2a0f..8246e796b5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2137,6 +2137,7 @@ Đóng Thử lại Đang hoàn tất đăng nhập… + Microsoft đã từ chối đăng nhập Xbox. Hãy đăng xuất Xbox trong Cửa hàng game, đăng nhập lại rồi tiếp tục. Không thể tải trang đăng nhập: %1$s Nhà cung cấp này từ chối đăng nhập từ một trang nhúng. Hãy đăng nhập bằng mật khẩu store của bạn thay vào đó. Trang đăng nhập trả về lỗi (HTTP %1$d). diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d7c20634c3..5b22e5b777 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2213,6 +2213,7 @@ 关闭 重试 正在完成登录… + Microsoft 拒绝了 Xbox 登录。请在游戏商店中退出 Xbox,重新登录,然后继续。 无法加载登录页面:%1$s 该第三方登录方式不允许在内嵌页面中登录。请改用商店密码登录。 登录页面返回了错误(HTTP %1$d)。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e021df01e0..e0c2b1d021 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2140,6 +2140,7 @@ 關閉 再試一次 正在完成登入… + Microsoft 拒絕了 Xbox 登入。請在商店中登出 Xbox,重新登入,然後繼續。 無法載入登入頁面:%1$s 此提供者不允許從內嵌頁面登入。請改用商店密碼登入。 登入頁面回應錯誤(HTTP %1$d)。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 44e41ea6ab..2f2f66e1de 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2140,6 +2140,7 @@ 關閉 再試一次 正在完成登入… + Microsoft 拒絕了 Xbox 登入。請在遊戲商店中登出 Xbox,重新登入,然後繼續。 無法載入登入頁面:%1$s 此提供者拒絕從內嵌頁面登入。請改用商店密碼登入。 登入頁面回應錯誤(HTTP %1$d)。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbe2d6fc36..1bd64ac04b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2249,6 +2249,7 @@ Close Try again Finishing sign-in… + Microsoft rejected the Xbox sign-in. Sign out of Xbox in Stores, sign in again, then resume. The sign-in page could not be loaded: %1$s This provider refuses to sign in from an embedded page. Sign in with your store password instead. The sign-in page answered with an error (HTTP %1$d). diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt new file mode 100644 index 0000000000..71627850a1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt @@ -0,0 +1,19 @@ +package com.droiddeck.launcher.stores.xbox + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class XodusDiagnosticsTest { + private val rejected = Regex(Xodus.SIGN_IN_REJECTED) + + @Test fun aContentLicenseRejectionIsRecognised() { + assertTrue("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings.".matches(rejected)) + assertTrue("Microsoft content licensing rejected sign-in (HTTP 403). Sign in again in Settings.".matches(rejected)) + } + + @Test fun otherStderrTextIsNotTakenForARejection() { + assertFalse("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings. token=abc".matches(rejected)) + assertFalse("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-http 401".matches(rejected)) + } +}