From 42ffd1a49e80839fba14ec44cd0a659bcd280a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
Date: Tue, 30 Aug 2022 07:52:27 +0200
Subject: [PATCH] Enable localization of session related strings

---
 .../store/view/ui/account/AccountActivity.kt       | 14 +++++++-------
 .../aurora/store/view/ui/splash/SplashActivity.kt  | 12 ++++++------
 app/src/main/res/values/strings.xml                |  8 ++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

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 4efbad11a..c8bee8c0c 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
@@ -79,12 +79,12 @@ class AccountActivity : BaseActivity() {
                 }
 
                 AuthState.Available -> {
-                    updateStatus("Verifying session")
+                    updateStatus(getString(R.string.session_verifying))
                     updateActionLayout(false)
                 }
 
                 AuthState.Unavailable -> {
-                    updateStatus("You need to login first")
+                    updateStatus(getString(R.string.session_login))
                     updateActionLayout(true)
                 }
 
@@ -93,7 +93,7 @@ class AccountActivity : BaseActivity() {
                 }
 
                 AuthState.SignedOut -> {
-                    updateStatus("Last session scrapped")
+                    updateStatus(getString(R.string.session_scrapped))
                     updateActionLayout(true)
                 }
 
@@ -114,10 +114,10 @@ class AccountActivity : BaseActivity() {
         when (event) {
             is BusEvent.GoogleAAS -> {
                 if (event.success) {
-                    updateStatus("Verifying Google Session")
+                    updateStatus(getString(R.string.session_verifying_google))
                     VM.buildGoogleAuthData(event.email, event.aasToken)
                 } else {
-                    updateStatus("Failed to login via Google")
+                    updateStatus(getString(R.string.session_login_failed_google))
                 }
             }
             else -> {
@@ -129,10 +129,10 @@ class AccountActivity : BaseActivity() {
     private fun updateContents() {
         if (accountProvider.isSignedIn()) {
             B.viewFlipper.displayedChild = 1
-            updateStatus("Woah! all good.")
+            updateStatus(getString(R.string.session_good))
         } else {
             B.viewFlipper.displayedChild = 0
-            updateStatus("Login and enjoy.")
+            updateStatus(getString(R.string.session_enjoy))
         }
 
         updateUserProfile()
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 f12cb967f..fffcea6f4 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
@@ -77,7 +77,7 @@ class SplashActivity : BaseActivity() {
         attachActions()
 
         //Initial status
-        updateStatus("Getting things ready..")
+        updateStatus(getString(R.string.session_init))
 
         VM.liveData.observe(this, {
             when (it) {
@@ -86,12 +86,12 @@ class SplashActivity : BaseActivity() {
                 }
 
                 AuthState.Available -> {
-                    updateStatus("Verifying session")
+                    updateStatus(getString(R.string.session_verifying))
                     updateActionLayout(false)
                 }
 
                 AuthState.Unavailable -> {
-                    updateStatus("You need to login first")
+                    updateStatus(getString(R.string.session_login))
                     updateActionLayout(true)
                 }
 
@@ -100,7 +100,7 @@ class SplashActivity : BaseActivity() {
                 }
 
                 AuthState.SignedOut -> {
-                    updateStatus("Last session scrapped")
+                    updateStatus(getString(R.string.session_scrapped))
                     updateActionLayout(true)
                 }
 
@@ -164,10 +164,10 @@ class SplashActivity : BaseActivity() {
         when (event) {
             is BusEvent.GoogleAAS -> {
                 if (event.success) {
-                    updateStatus("Verifying Google Session")
+                    updateStatus(getString(R.string.session_verifying_google))
                     VM.buildGoogleAuthData(event.email, event.aasToken)
                 } else {
-                    updateStatus("Failed to login via Google")
+                    updateStatus(getString(R.string.session_login_failed_google))
                 }
             }
             else -> {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 717b60079..a3bb63fe8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -316,6 +316,14 @@
     <string name="purchase_not_found">"App not found"</string>
     <string name="purchase_no_file">"Could not get files"</string>
     <string name="purchase_session_expired">"Session expired, re-login to obtain new session."</string>
+    <string name="session_enjoy">Login and enjoy.</string>
+    <string name="session_good">Woah! All good.</string>
+    <string name="session_init">Getting things ready…</string>
+    <string name="session_login">You need to login first</string>
+    <string name="session_login_failed_google">Failed to login via Google</string>
+    <string name="session_scrapped">Last session scrapped</string>
+    <string name="session_verifying">Verifying session</string>
+    <string name="session_verifying_google">Verifying Google Session</string>
     <string name="spoof_apply">"Make sure you re-login to apply the spoof"</string>
     <string name="insecure_anonymous_apply">"Make sure you re-login and restart app to apply changes."</string>
     <string name="tab_categories">"Categories"</string>