fix(xbox): say to sign in again when Microsoft rejects the download's licenses

This commit is contained in:
maxjivi05 authored and MaxsTechReview committed 2026-10-24 09:07:13 -04:00
1 parent a66d7d74a4
commit 6855dd4467
36 files changed
+62 -2

No files matched your search

@@ -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) {
@@ -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)
} }
}
+1
View File
@@ -2242,6 +2242,7 @@
<string name="stores_login_close">إغلاق</string>
<string name="stores_login_retry">حاوِل مرة أخرى</string>
<string name="stores_login_finishing">جارٍ إنهاء تسجيل الدخول…</string>
<string name="stores_xbox_sign_in_again">رفضت Microsoft تسجيل الدخول إلى Xbox. سجّل الخروج من Xbox في المتاجر، ثم سجّل الدخول مجددًا، ثم استأنف.</string>
<string name="stores_login_error_network">تعذّر تحميل صفحة تسجيل الدخول: %1$s</string>
<string name="stores_login_error_idp_blocked">يرفض هذا المزوّد تسجيل الدخول من صفحة مضمَّنة. سجِّل الدخول باستخدام كلمة مرور المتجر بدلاً من ذلك.</string>
<string name="stores_login_error_http">استجابت صفحة تسجيل الدخول بخطأ (HTTP %1$d).</string>
@@ -2194,6 +2194,7 @@
<string name="stores_login_close">Cerrar</string>
<string name="stores_login_retry">Reintentar</string>
<string name="stores_login_finishing">Terminando de iniciar sesión…</string>
<string name="stores_xbox_sign_in_again">Microsoft rechazó el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y luego reanuda.</string>
<string name="stores_login_error_network">No se pudo cargar la página de inicio de sesión: %1$s</string>
<string name="stores_login_error_idp_blocked">Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda.</string>
<string name="stores_login_error_http">La página de inicio de sesión respondió con un error (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Затвори</string>
<string name="stores_login_retry">Опитай отново</string>
<string name="stores_login_finishing">Завършване на входа…</string>
<string name="stores_xbox_sign_in_again">Microsoft отхвърли входа в Xbox. Излезте от Xbox в Магазини, влезте отново и след това продължете.</string>
<string name="stores_login_error_network">Страницата за вход не можа да се зареди: %1$s</string>
<string name="stores_login_error_idp_blocked">Този доставчик отказва вход от вградена страница. Впиши се с паролата си за магазина.</string>
<string name="stores_login_error_http">Страницата за вход отговори с грешка (HTTP %1$d).</string>
+1
View File
@@ -2200,6 +2200,7 @@
<string name="stores_login_close">Zavřít</string>
<string name="stores_login_retry">Zkusit znovu</string>
<string name="stores_login_finishing">Dokončování přihlášení…</string>
<string name="stores_xbox_sign_in_again">Microsoft odmítl přihlášení k Xboxu. V Obchodech se z Xboxu odhlaste, znovu se přihlaste a pak pokračujte.</string>
<string name="stores_login_error_network">Přihlašovací stránku se nepodařilo načíst: %1$s</string>
<string name="stores_login_error_idp_blocked">Tento poskytovatel odmítá přihlášení ze vložené stránky. Přihlaste se místo toho heslem k obchodu.</string>
<string name="stores_login_error_http">Přihlašovací stránka odpověděla chybou (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Luk</string>
<string name="stores_login_retry">Forsøg igen</string>
<string name="stores_login_finishing">Afslutter login…</string>
<string name="stores_xbox_sign_in_again">Microsoft afviste Xbox-login. Log ud af Xbox under Butikker, log ind igen, og genoptag derefter.</string>
<string name="stores_login_error_network">Loginsiden kunne ikke indlæses: %1$s</string>
<string name="stores_login_error_idp_blocked">Denne udbyder afviser login fra en indlejret side. Log i stedet ind med din butikskodeord.</string>
<string name="stores_login_error_http">Loginsiden svarede med en fejl (HTTP %1$d).</string>
+1
View File
@@ -2147,6 +2147,7 @@
<string name="stores_login_close">Schließen</string>
<string name="stores_login_retry">Erneut versuchen</string>
<string name="stores_login_finishing">Anmeldung wird abgeschlossen…</string>
<string name="stores_xbox_sign_in_again">Microsoft hat die Xbox-Anmeldung abgelehnt. Melde dich unter Stores von Xbox ab, melde dich erneut an und setze dann fort.</string>
<string name="stores_login_error_network">Die Anmeldeseite konnte nicht geladen werden: %1$s</string>
<string name="stores_login_error_idp_blocked">Dieser Anbieter lässt keine Anmeldung über eine eingebettete Seite zu. Melde dich stattdessen mit deinem Store-Passwort an.</string>
<string name="stores_login_error_http">Die Anmeldeseite antwortete mit einem Fehler (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Κλείσιμο</string>
<string name="stores_login_retry">Δοκιμάστε ξανά</string>
<string name="stores_login_finishing">Ολοκλήρωση σύνδεσης…</string>
<string name="stores_xbox_sign_in_again">Η Microsoft απέρριψε τη σύνδεση στο Xbox. Αποσυνδεθείτε από το Xbox στα Καταστήματα, συνδεθείτε ξανά και μετά συνεχίστε.</string>
<string name="stores_login_error_network">Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης: %1$s</string>
<string name="stores_login_error_idp_blocked">Αυτός ο πάροχος αρνείται να συνδεθεί από μια ενσωματωμένη σελίδα. Συνδεθείτε με τον κωδικό πρόσβασης του καταστήματός σας αντ\' αυτού.</string>
<string name="stores_login_error_http">Η σελίδα σύνδεσης απάντησε με σφάλμα (HTTP %1$d).</string>
+1
View File
@@ -2178,6 +2178,7 @@
<string name="stores_login_close">Cerrar</string>
<string name="stores_login_retry">Reintentar</string>
<string name="stores_login_finishing">Terminando de iniciar sesión…</string>
<string name="stores_xbox_sign_in_again">Microsoft ha rechazado el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y reanuda.</string>
<string name="stores_login_error_network">No se pudo cargar la página de inicio de sesión: %1$s</string>
<string name="stores_login_error_idp_blocked">Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda.</string>
<string name="stores_login_error_http">La página de inicio de sesión respondió con un error (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Sulje</string>
<string name="stores_login_retry">Yritä uudelleen</string>
<string name="stores_login_finishing">Viimeistellään kirjautumista…</string>
<string name="stores_xbox_sign_in_again">Microsoft hylkäsi Xbox-kirjautumisen. Kirjaudu ulos Xboxista Kaupoissa, kirjaudu uudelleen sisään ja jatka sitten.</string>
<string name="stores_login_error_network">Kirjautumissivua ei voitu latata: %1$s</string>
<string name="stores_login_error_idp_blocked">Tämä palveluntarjoaja ei salli kirjautumista upotetulta sivulta. Kirjaudu sisään kaupan salasanalla sen sijaan.</string>
<string name="stores_login_error_http">Kirjautumissivu vastasi virheellä (HTTP %1$d).</string>
+1
View File
@@ -2178,6 +2178,7 @@
<string name="stores_login_close">Fermer</string>
<string name="stores_login_retry">Réessayer</string>
<string name="stores_login_finishing">Finalisation de la connexion…</string>
<string name="stores_xbox_sign_in_again">Microsoft a refusé la connexion Xbox. Déconnectez-vous de Xbox dans Boutiques, reconnectez-vous, puis reprenez.</string>
<string name="stores_login_error_network">Impossible de charger la page de connexion : %1$s</string>
<string name="stores_login_error_idp_blocked">Ce fournisseur refuse la connexion depuis une page intégrée. Connectez-vous plutôt avec le mot de passe de la boutique.</string>
<string name="stores_login_error_http">La page de connexion a renvoyé une erreur (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">बंद करें</string>
<string name="stores_login_retry">फिर कोशिश करें</string>
<string name="stores_login_finishing">साइन-इन पूरा हो रहा है…</string>
<string name="stores_xbox_sign_in_again">Microsoft ने Xbox साइन-इन अस्वीकार कर दिया। स्टोर्स में Xbox से साइन आउट करें, फिर से साइन इन करें, फिर जारी रखें।</string>
<string name="stores_login_error_network">साइन-इन पेज लोड नहीं हो सका: %1$s</string>
<string name="stores_login_error_idp_blocked">यह प्रोवाइडर एम्बेडेड पेज से साइन इन करने से मना करता है। इसके बदले अपने स्टोर पासवर्ड से साइन इन करें।</string>
<string name="stores_login_error_http">साइन-इन पेज ने एक एरर के साथ जवाब दिया (HTTP %1$d)।</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Bezárás</string>
<string name="stores_login_retry">Próbálja újra</string>
<string name="stores_login_finishing">A bejelentkezés befejezése…</string>
<string name="stores_xbox_sign_in_again">A Microsoft elutasította az Xbox-bejelentkezést. Az Áruházakban jelentkezz ki az Xboxból, jelentkezz be újra, majd folytasd.</string>
<string name="stores_login_error_network">Nem sikerült betölteni a bejelentkezési oldalt: %1$s</string>
<string name="stores_login_error_idp_blocked">Ez a szolgáltató nem engedi a bejelentkezést egy beágyazott oldalról. Jelentkezzen be helyette az áruház jelszavával.</string>
<string name="stores_login_error_http">A bejelentkezési oldal hibával válaszolt (HTTP %1$d).</string>
+1
View File
@@ -2137,6 +2137,7 @@
<string name="stores_login_close">Tutup</string>
<string name="stores_login_retry">Coba lagi</string>
<string name="stores_login_finishing">Menyelesaikan proses masuk…</string>
<string name="stores_xbox_sign_in_again">Microsoft menolak masuk Xbox. Keluar dari Xbox di Toko, masuk lagi, lalu lanjutkan.</string>
<string name="stores_login_error_network">Halaman masuk tidak dapat dimuat: %1$s</string>
<string name="stores_login_error_idp_blocked">Penyedia ini menolak proses masuk dari halaman tersemat. Masuk dengan kata sandi toko Anda sebagai gantinya.</string>
<string name="stores_login_error_http">Halaman masuk merespons dengan kesalahan (HTTP %1$d).</string>
+1
View File
@@ -2168,6 +2168,7 @@
<string name="stores_login_close">Chiudi</string>
<string name="stores_login_retry">Riprova</string>
<string name="stores_login_finishing">Completamento dell\'accesso…</string>
<string name="stores_xbox_sign_in_again">Microsoft ha rifiutato l\'accesso a Xbox. Esci da Xbox in Negozi, accedi di nuovo, poi riprendi.</string>
<string name="stores_login_error_network">Impossibile caricare la pagina di accesso: %1$s</string>
<string name="stores_login_error_idp_blocked">Questo provider non consente l\'accesso da una pagina incorporata. Accedi invece con la password del negozio.</string>
<string name="stores_login_error_http">La pagina di accesso ha risposto con un errore (HTTP %1$d).</string>
+1
View File
@@ -2139,6 +2139,7 @@
<string name="stores_login_close">閉じる</string>
<string name="stores_login_retry">再試行</string>
<string name="stores_login_finishing">ログインを完了しています…</string>
<string name="stores_xbox_sign_in_again">Microsoft が Xbox のサインインを拒否しました。ストアで Xbox からサインアウトし、もう一度サインインしてから再開してください。</string>
<string name="stores_login_error_network">ログインページを読み込めませんでした:%1$s</string>
<string name="stores_login_error_idp_blocked">このプロバイダーは埋め込みページからのログインを拒否しています。代わりにストアのパスワードでログインしてください。</string>
<string name="stores_login_error_http">ログインページがエラーを返しました(HTTP %1$d)。</string>
+1
View File
@@ -2139,6 +2139,7 @@
<string name="stores_login_close">닫기</string>
<string name="stores_login_retry">다시 시도</string>
<string name="stores_login_finishing">로그인 완료 중…</string>
<string name="stores_xbox_sign_in_again">Microsoft에서 Xbox 로그인을 거부했습니다. 스토어에서 Xbox 로그아웃 후 다시 로그인한 다음 재개하세요.</string>
<string name="stores_login_error_network">로그인 페이지를 불러올 수 없습니다: %1$s</string>
<string name="stores_login_error_idp_blocked">이 제공업체는 앱에 포함된 페이지에서 로그인을 허용하지 않습니다. 대신 스토어 비밀번호로 로그인하세요.</string>
<string name="stores_login_error_http">로그인 페이지에서 오류를 반환했습니다(HTTP %1$d).</string>
+1
View File
@@ -2137,6 +2137,7 @@
<string name="stores_login_close">Tutup</string>
<string name="stores_login_retry">Cuba lagi</string>
<string name="stores_login_finishing">Menyelesaikan log masuk…</string>
<string name="stores_xbox_sign_in_again">Microsoft menolak log masuk Xbox. Log keluar daripada Xbox di Kedai, log masuk semula, kemudian sambung.</string>
<string name="stores_login_error_network">Halaman log masuk tidak dapat dimuatkan: %1$s</string>
<string name="stores_login_error_idp_blocked">Penyedia ini menolak log masuk daripada halaman terbenam. Log masuk dengan kata laluan kedai anda sebaliknya.</string>
<string name="stores_login_error_http">Halaman log masuk menjawab dengan ralat (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Lukk</string>
<string name="stores_login_retry">Prøv igjen</string>
<string name="stores_login_finishing">Fullfører innlogging…</string>
<string name="stores_xbox_sign_in_again">Microsoft avviste Xbox-påloggingen. Logg ut av Xbox under Butikker, logg på igjen, og fortsett deretter.</string>
<string name="stores_login_error_network">Innloggingssiden kunne ikke lastes: %1$s</string>
<string name="stores_login_error_idp_blocked">Denne leverandøren tillater ikke innlogging fra en innebygd side. Logg inn med butikkpassordet ditt i stedet.</string>
<string name="stores_login_error_http">Innloggingssiden svarte med en feil (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Sluiten</string>
<string name="stores_login_retry">Probeer het opnieuw</string>
<string name="stores_login_finishing">Aanmelden afronden…</string>
<string name="stores_xbox_sign_in_again">Microsoft heeft de Xbox-aanmelding geweigerd. Meld je af bij Xbox in Winkels, meld je opnieuw aan en hervat daarna.</string>
<string name="stores_login_error_network">De aanmeldpagina kon niet worden geladen: %1$s</string>
<string name="stores_login_error_idp_blocked">Deze provider staat geen aanmelding via een ingesloten pagina toe. Meld je in plaats daarvan aan met je winkelwachtwoord.</string>
<string name="stores_login_error_http">De aanmeldpagina gaf een foutmelding (HTTP %1$d).</string>
+1
View File
@@ -2203,6 +2203,7 @@
<string name="stores_login_close">Zamknij</string>
<string name="stores_login_retry">Spróbuj ponownie</string>
<string name="stores_login_finishing">Kończenie logowania…</string>
<string name="stores_xbox_sign_in_again">Microsoft odrzucił logowanie do Xbox. Wyloguj się z Xbox w Sklepach, zaloguj się ponownie, a potem wznów.</string>
<string name="stores_login_error_network">Nie udało się wczytać strony logowania: %1$s</string>
<string name="stores_login_error_idp_blocked">Ten dostawca odmawia logowania z osadzonej strony. Zaloguj się za pomocą hasła do sklepu.</string>
<string name="stores_login_error_http">Strona logowania odpowiedziała błędem (HTTP %1$d).</string>
@@ -2168,6 +2168,7 @@
<string name="stores_login_close">Fechar</string>
<string name="stores_login_retry">Tentar novamente</string>
<string name="stores_login_finishing">A concluir o início de sessão…</string>
<string name="stores_xbox_sign_in_again">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.</string>
<string name="stores_login_error_network">Não foi possível carregar a página de início de sessão: %1$s</string>
<string name="stores_login_error_idp_blocked">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.</string>
<string name="stores_login_error_http">A página de início de sessão respondeu com um erro (HTTP %1$d).</string>
+1
View File
@@ -2168,6 +2168,7 @@
<string name="stores_login_close">Fechar</string>
<string name="stores_login_retry">Tentar de novo</string>
<string name="stores_login_finishing">Concluindo o login…</string>
<string name="stores_xbox_sign_in_again">A Microsoft recusou o login do Xbox. Saia do Xbox em Lojas, entre novamente e depois retome.</string>
<string name="stores_login_error_network">Não foi possível carregar a página de login: %1$s</string>
<string name="stores_login_error_idp_blocked">Este provedor não permite login a partir de uma página incorporada. Faça login com a senha da loja.</string>
<string name="stores_login_error_http">A página de login respondeu com um erro (HTTP %1$d).</string>
+1
View File
@@ -2179,6 +2179,7 @@
<string name="stores_login_close">Închide</string>
<string name="stores_login_retry">Încearcă din nou</string>
<string name="stores_login_finishing">Se finalizează autentificarea…</string>
<string name="stores_xbox_sign_in_again">Microsoft a respins conectarea la Xbox. Deconectează-te de la Xbox în Magazine, conectează-te din nou, apoi reia.</string>
<string name="stores_login_error_network">Pagina de autentificare nu a putut fi încărcată: %1$s</string>
<string name="stores_login_error_idp_blocked">Acest furnizor refuză autentificarea dintr-o pagină încorporată. Autentifică-te cu parola magazinului în schimb.</string>
<string name="stores_login_error_http">Pagina de autentificare a răspuns cu o eroare (HTTP %1$d).</string>
+1
View File
@@ -2199,6 +2199,7 @@
<string name="stores_login_close">Закрыть</string>
<string name="stores_login_retry">Повторить</string>
<string name="stores_login_finishing">Завершение входа…</string>
<string name="stores_xbox_sign_in_again">Microsoft отклонила вход в Xbox. Выйдите из Xbox в разделе «Магазины», войдите снова и продолжите.</string>
<string name="stores_login_error_network">Не удалось загрузить страницу входа: %1$s</string>
<string name="stores_login_error_idp_blocked">Этот сервис не разрешает вход со встроенной страницы. Войдите с паролем от магазина.</string>
<string name="stores_login_error_http">Страница входа вернула ошибку (HTTP %1$d).</string>
+1
View File
@@ -2158,6 +2158,7 @@
<string name="stores_login_close">Stäng</string>
<string name="stores_login_retry">Försök igen</string>
<string name="stores_login_finishing">Slutför inloggningen…</string>
<string name="stores_xbox_sign_in_again">Microsoft avvisade Xbox-inloggningen. Logga ut från Xbox under Butiker, logga in igen och återuppta sedan.</string>
<string name="stores_login_error_network">Inloggningssidan kunde inte läsas in: %1$s</string>
<string name="stores_login_error_idp_blocked">Den här leverantören vägrar logga in från en inbäddad sida. Logga in med ditt butikslösenord istället.</string>
<string name="stores_login_error_http">Inloggningssidan svarade med ett fel (HTTP %1$d).</string>
+1
View File
@@ -2137,6 +2137,7 @@
<string name="stores_login_close">ปิด</string>
<string name="stores_login_retry">ลองใหม่</string>
<string name="stores_login_finishing">กำลังเสร็จสิ้นการลงชื่อเข้าใช้…</string>
<string name="stores_xbox_sign_in_again">Microsoft ปฏิเสธการลงชื่อเข้าใช้ Xbox ลงชื่อออกจาก Xbox ในสโตร์ ลงชื่อเข้าใช้อีกครั้ง แล้วดำเนินการต่อ</string>
<string name="stores_login_error_network">ไม่สามารถโหลดหน้าลงชื่อเข้าใช้ได้: %1$s</string>
<string name="stores_login_error_idp_blocked">ผู้ให้บริการนี้ปฏิเสธการลงชื่อเข้าใช้จากหน้าที่ฝังอยู่ ให้ลงชื่อเข้าใช้ด้วยรหัสผ่านของสโตร์แทน</string>
<string name="stores_login_error_http">หน้าลงชื่อเข้าใช้ตอบกลับด้วยข้อผิดพลาด (HTTP %1$d)</string>
+1
View File
@@ -2149,6 +2149,7 @@
<string name="stores_login_close">Kapat</string>
<string name="stores_login_retry">Yeniden dene</string>
<string name="stores_login_finishing">Oturum açma tamamlanıyor…</string>
<string name="stores_xbox_sign_in_again">Microsoft, Xbox oturum açmayı reddetti. Mağazalar\'da Xbox oturumunu kapatın, yeniden oturum açın ve devam edin.</string>
<string name="stores_login_error_network">Oturum açma sayfası yüklenemedi: %1$s</string>
<string name="stores_login_error_idp_blocked">Bu sağlayıcı yerleşik bir sayfadan oturum açmayı reddediyor. Bunun yerine mağaza parolanızla oturum açın.</string>
<string name="stores_login_error_http">Oturum açma sayfası bir hatayla yanıt verdi (HTTP %1$d).</string>
+1
View File
@@ -2200,6 +2200,7 @@
<string name="stores_login_close">Закрити</string>
<string name="stores_login_retry">Спробувати ще раз</string>
<string name="stores_login_finishing">Завершення входу…</string>
<string name="stores_xbox_sign_in_again">Microsoft відхилила вхід у Xbox. Вийдіть з Xbox у розділі «Магазини», увійдіть знову й продовжте.</string>
<string name="stores_login_error_network">Не вдалося завантажити сторінку входу: %1$s</string>
<string name="stores_login_error_idp_blocked">Цей провайдер не дозволяє вхід із вбудованої сторінки. Увійдіть за допомогою пароля магазину.</string>
<string name="stores_login_error_http">Сторінка входу відповіла помилкою (HTTP %1$d).</string>
+1
View File
@@ -2137,6 +2137,7 @@
<string name="stores_login_close">Đóng</string>
<string name="stores_login_retry">Thử lại</string>
<string name="stores_login_finishing">Đang hoàn tất đăng nhập…</string>
<string name="stores_xbox_sign_in_again">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.</string>
<string name="stores_login_error_network">Không thể tải trang đăng nhập: %1$s</string>
<string name="stores_login_error_idp_blocked">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 đó.</string>
<string name="stores_login_error_http">Trang đăng nhập trả về lỗi (HTTP %1$d).</string>
@@ -2213,6 +2213,7 @@
<string name="stores_login_close">关闭</string>
<string name="stores_login_retry">重试</string>
<string name="stores_login_finishing">正在完成登录…</string>
<string name="stores_xbox_sign_in_again">Microsoft 拒绝了 Xbox 登录。请在游戏商店中退出 Xbox,重新登录,然后继续。</string>
<string name="stores_login_error_network">无法加载登录页面:%1$s</string>
<string name="stores_login_error_idp_blocked">该第三方登录方式不允许在内嵌页面中登录。请改用商店密码登录。</string>
<string name="stores_login_error_http">登录页面返回了错误(HTTP %1$d)。</string>
@@ -2140,6 +2140,7 @@
<string name="stores_login_close">關閉</string>
<string name="stores_login_retry">再試一次</string>
<string name="stores_login_finishing">正在完成登入…</string>
<string name="stores_xbox_sign_in_again">Microsoft 拒絕了 Xbox 登入。請在商店中登出 Xbox,重新登入,然後繼續。</string>
<string name="stores_login_error_network">無法載入登入頁面:%1$s</string>
<string name="stores_login_error_idp_blocked">此提供者不允許從內嵌頁面登入。請改用商店密碼登入。</string>
<string name="stores_login_error_http">登入頁面回應錯誤(HTTP %1$d)。</string>
@@ -2140,6 +2140,7 @@
<string name="stores_login_close">關閉</string>
<string name="stores_login_retry">再試一次</string>
<string name="stores_login_finishing">正在完成登入…</string>
<string name="stores_xbox_sign_in_again">Microsoft 拒絕了 Xbox 登入。請在遊戲商店中登出 Xbox,重新登入,然後繼續。</string>
<string name="stores_login_error_network">無法載入登入頁面:%1$s</string>
<string name="stores_login_error_idp_blocked">此提供者拒絕從內嵌頁面登入。請改用商店密碼登入。</string>
<string name="stores_login_error_http">登入頁面回應錯誤(HTTP %1$d)。</string>
+1
View File
@@ -2249,6 +2249,7 @@
<string name="stores_login_close">Close</string>
<string name="stores_login_retry">Try again</string>
<string name="stores_login_finishing">Finishing sign-in…</string>
<string name="stores_xbox_sign_in_again">Microsoft rejected the Xbox sign-in. Sign out of Xbox in Stores, sign in again, then resume.</string>
<string name="stores_login_error_network">The sign-in page could not be loaded: %1$s</string>
<string name="stores_login_error_idp_blocked">This provider refuses to sign in from an embedded page. Sign in with your store password instead.</string>
<string name="stores_login_error_http">The sign-in page answered with an error (HTTP %1$d).</string>
@@ -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))
}
}