diff --git a/app/src/main/java/com/aurora/store/data/State.kt b/app/src/main/java/com/aurora/store/data/State.kt index 3a5cd0eaf..b5f86bd73 100644 --- a/app/src/main/java/com/aurora/store/data/State.kt +++ b/app/src/main/java/com/aurora/store/data/State.kt @@ -41,6 +41,5 @@ sealed class AuthState { object SignedOut : AuthState() object Valid : AuthState() object Fetching: AuthState() - object InValid: AuthState() data class Status(val status: String?) : AuthState() } \ No newline at end of file diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt index 334839a7d..c8158a62d 100644 --- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt @@ -90,11 +90,7 @@ class AccountActivity : BaseActivity() { updateStatus(getString(R.string.requesting_new_session)) } AuthState.Valid -> { - updateContents() - } - AuthState.InValid -> { - updateStatus(getString(R.string.failed_validating_account)) } AuthState.Available -> { @@ -108,7 +104,7 @@ class AccountActivity : BaseActivity() { } AuthState.SignedIn -> { - VM.observe() + updateContents() } AuthState.SignedOut -> { diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt index 58e022cb8..bc0206c9e 100644 --- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt @@ -102,11 +102,6 @@ class SplashActivity : BaseActivity() { moveToContent() } - AuthState.InValid -> { - updateStatus(getString(R.string.failed_validating_account)) - updateActionLayout(true) - } - AuthState.Available -> { updateStatus(getString(R.string.session_verifying)) updateActionLayout(false) @@ -118,7 +113,7 @@ class SplashActivity : BaseActivity() { } AuthState.SignedIn -> { - VM.observe() + moveToContent() } AuthState.SignedOut -> { diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt index 7f71d74f7..741c43cbe 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt @@ -215,7 +215,7 @@ class AuthViewModel(application: Application) : BaseAndroidViewModel(application buildGoogleAuthData(email, aasToken) } AccountType.ANONYMOUS -> { - liveData.postValue(AuthState.InValid) + buildAnonymousAuthData() } } } diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index 568f63764..466313712 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -156,9 +156,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginHorizontal="@dimen/margin_large" - android:layout_marginVertical="@dimen/margin_small" - android:maxLines="2" + android:layout_marginTop="@dimen/margin_small" android:textAlignment="center" tools:text="Status" /> diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 12226ab7d..e4f2f389a 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -64,8 +64,6 @@ android:layout_height="wrap_content" android:layout_below="@id/txt_title" android:layout_centerHorizontal="true" - android:layout_marginHorizontal="@dimen/margin_large" - android:maxLines="2" android:textAlignment="center" tools:text="Sign in first" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9b41f038c..f8ab60f40 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -341,8 +341,6 @@ التحقق من وجود تحديثات التحقق من التحديثات تلقائيا إجراء فحص آلي \" لإشعار بالتحديثات الجديدة \" بصورة دورية - فشل التحقق من صحة الحساب ، قد يكون محدودا في السعة. -\nيرجى تسجيل الدخول مرة أخرى! إشعارات التحديثات تحديث %1$d متاح تحديثات %1$d متوفرة @@ -350,4 +348,4 @@ %1$s, %2$s و %3$s مثبت شيزوكو لم يتم تثبيت Shizuku أو إعداده بشكل صحيح. - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b29de062c..fbc39b328 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -341,8 +341,6 @@ Kontrola aktualizací Automatická kontrola aktualizací Automatická kontrola a pravidelné upozorňování na nové aktualizace aplikací - Nepodařilo se ověřit účet, možná je omezen. -\nPřihlaste se prosím znovu! Je dostupná nová verze aplikace %1$s %1$s a %2$s %1$s, %2$s a %3$s @@ -350,4 +348,4 @@ %1$d dostupných aktualizací Skizuku není nainstalováno nebo správně nastaveno. Shizuku instalátor - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d54712342..6177959ad 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -345,10 +345,8 @@ Eine neue Version von %1$s ist verfügbar Update-Überprüfung %1$s, %2$s, %3$s und %4$d weitere - Kontoüberprüfung fehlgeschlagen, mögliche Tarifbeschränkung. -\nBitte neu anmelden! %1$d vorhandene Updates %1$s und %2$s Automatische Update-Überprüfung Regelmäßige automatische Prüfung und Benachrichtigung zu neuen App-Updates - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 425600fb5..ca668fe7e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -342,12 +342,10 @@ Comprobando las actualizaciones Comprobación automática de actualizaciones Comprobación automática y notificación periódica de nuevas actualizaciones de la aplicación - No se ha podido validar la cuenta, puede que la tarifa esté limitada. -\n¡Vuelve a iniciar sesión! Notificaciones de actualizaciones %1$d actualizaciones disponibles Una nueva versión de %1$s está disponible %1$s, %2$s y %3$s Instalador de Shizuku Shizuku no está instalado o configurado correctamente. - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index aeaa18e8f..d6cf3df07 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -344,10 +344,8 @@ Automaattinen päivitysten tarkistus %1$s, %2$s, %3$s ja %4$d lisää Tarkista ja ilmoita uusista sovelluspäivityksistä automaattisesti säännöllisesti - Tiliä ei onnistuttu vahvistamaan, saattaa olla rajoitettu. -\nKirjaudu uudelleen! Shizukun asennusohjelma %1$d päivitystä saatavilla %1$s, %2$s ja %3$s Shizuku ei ole asennettu tai asetettu oikein. - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aac2472aa..9d630d0ae 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -346,8 +346,6 @@ Installateur Shizuku Notifications de mise à jour Vérifier et notifier automatiquement les nouvelles mises à jour de l’application à intervalles réguliers - Échec de la validation du compte, il se peut que le débit soit limité. -\nVeuillez vous connecter à nouveau ! %1$d mise à jour disponible %1$s, %2$s, %3$s et %4$d plus - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ce7096d86..c19061314 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -340,8 +340,6 @@ Controllo degli aggiornamenti Controllo automatico degli aggiornamenti Controlla automaticamente e notifica periodicamente i nuovi aggiornamenti delle applicazioni - Non è stato possibile convalidare l’account, potrebbe essere a tariffa limitata. -\nSi prega di effettuare nuovamente l’accesso! %1$s, %2$s e %3$s Installatore Shizuku Shizuku non è installato o impostato correttamente. @@ -350,4 +348,4 @@ È disponibile una nuova versione di %1$s %1$s e %2$s %1$s, %2$s , %3$s e %4$d più - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index ebec59226..56e66eea5 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -348,6 +348,4 @@ %1$s • API %2$s Nepieciešamās atļaujas tika noraidītas. Lūgums tās nodrošināt, lai turpinātu darbību Meklēt lietotnes un spēles - Neizdevās pārbaudīt kontu, tam varētu būt pieprasījumu ierobežojumi. -\nLūgums pieteikties vēlreiz. - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 490e3621f..6ddc349a7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -311,8 +311,6 @@ Google-sessie verifiëren Systeem Server buiten gebruik voor werkzaamheden - Account valideren mislukt, kan mogelijk tariefbeperkt zijn. -\nLog alstublieft opnieuw in! Aan het downloaden • %1$d / %2$d%3$s Shizuku is niet geïnstalleerd of niet goed ingesteld. Meldingen @@ -350,4 +348,4 @@ %1$s en %2$s Controleren op updates Automatische controle voor updates - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 34b387d5c..23ca957ee 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -337,8 +337,6 @@ Zaimportowano konfigurację urządzenia Nie można zaimportować konfiguracji urządzenia %1$d dostępna aktualizacja - Nie udało się zweryfikować konta (możesz mieć ograniczoną liczbę żądań). -\nZaloguj się ponownie! %1$d dostępne aktualizacje %1$s, %2$s, %3$s oraz %4$d innych Powiadomienia o aktualizacjach @@ -350,4 +348,4 @@ Automatycznie sprawdzaj i powiadamiaj o nowych aktualizacjach aplikacji Instalator Shizuku Shizuku nie jest prawidłowo zainstalowany lub skonfigurowany. - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f681c8581..6ca3e459c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -339,8 +339,6 @@ %1$d доступно обновление Новая версия %1$s доступна Проверка обновлений - Ошибка валидации аккаунта, возможно ограничение по частоте входа. -\nПожалуйста, войдите снова! Уведомления об обновлениях %1$d доступны обновления %1$s и %2$s @@ -350,4 +348,4 @@ Shizuku не установлено или не настроено правильно. Установщик Shizuku %1$s, %2$s, %3$s и ещё %4$d приложений - \ No newline at end of file + diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index ddbcdf6b4..399bb7eaf 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -340,8 +340,6 @@ ස්වයංක්‍රීය යාවත්කාල පරීක්‍ෂාව වරින් වර නව යෙදුම් යාවත්කාල පරීක්‍ෂා කර දැනුම් දෙයි යාවත්කාල බලමින් - ගිණුම වලංගුකරණයට අසමත් විය, අනුපාත සීමාව විය හැකිය. -\nනැවත පිවිසෙන්න! යාවත්කාල %1$d ක් තිබේ ෂිසුකු හරියාකාරව සකසා හෝ ස්ථාපනය කර නැත. ෂිසුකු ස්ථාපකය @@ -350,4 +348,4 @@ %1$s, %2$s හා %3$s %1$s හා %2$s %1$s, %2$s, %3$s හා තවත් %4$d - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 56e8e7639..f81fb9486 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -339,8 +339,6 @@ Güncellemeler denetleniyor Otomatik güncelleme denetimi Yeni uygulama güncellemelerini düzenli aralıklarla otomatik olarak denetle ve bildir - Hesap doğrulanamadı, hız sınırı olabilir. -\nLütfen tekrar oturum açın! Güncelleme bildirimleri %1$d güncelleme var %1$d güncelleme var @@ -350,4 +348,4 @@ %1$s, %2$s, %3$s ve %4$d tane daha Shizuku kurucu Shizuku düzgün kurulmadı veya ayarlanmadı. - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 43f5d6814..65b9dc322 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -346,8 +346,6 @@ %1$s, %2$s, %3$s та ще %4$d Перевірка наявності оновлень Періодична автоматична перевірка та сповіщення про нові оновлення застосунку - Не вдалося підтвердити обліковий запис, можливо, швидкість обмежена. -\nУвійдіть ще раз! Shizuku не встановлено або не налаштовано належним чином. Інсталятор Shizuku - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 575f0b1d4..3d1c8247b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -346,8 +346,6 @@ 更新通知 %1$s%2$s %1$s%2$s%3$s - 账户验证失败,可能被限制速率了。 -\n请再次登录! Shizuku 安装器 未安装或正确设置 Shizuku。 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9134b38b..648ece348 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -368,5 +368,4 @@ Checking for updates Automated updates check Automatically check & notify for new app updates periodically - Failed to validate account, might be rate-limited.\nPlease login again!