From 6bf75bb68a29840f42e05bd95f44978e51827424 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Sat, 1 Jun 2024 13:26:45 +0530
Subject: [PATCH] AccountFragment: Throw users on splashFragment on logout

We have multiple checks implemented at this point in splashFragment to ensure
proper validation and navigation. If a user logs out and hits back button, he still
gets to browse Aurora Store which is an unintended behaviour.

Instead of handling same logic twice everywhere, make AccountFragment minimal and only
handle logging out here.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../store/data/providers/AccountProvider.kt   |   8 -
 .../store/view/ui/account/AccountFragment.kt  | 168 ++----------------
 .../store/view/ui/account/GoogleFragment.kt   |  18 +-
 .../store/view/ui/splash/SplashFragment.kt    |  13 +-
 .../main/res/layout-land/fragment_account.xml | 107 +++--------
 app/src/main/res/layout/fragment_account.xml  | 105 +++--------
 .../main/res/navigation/mobile_navigation.xml |  17 +-
 app/src/main/res/values-ar/strings.xml        |   1 -
 app/src/main/res/values-ast/strings.xml       |   1 -
 app/src/main/res/values-az/strings.xml        |   1 -
 app/src/main/res/values-bg/strings.xml        |   1 -
 app/src/main/res/values-bn/strings.xml        |   1 -
 app/src/main/res/values-ca/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-eo/strings.xml        |   1 -
 app/src/main/res/values-es/strings.xml        |   1 -
 app/src/main/res/values-eu/strings.xml        |   1 -
 app/src/main/res/values-fa/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-gl/strings.xml        |   1 -
 app/src/main/res/values-he/strings.xml        |   1 -
 app/src/main/res/values-hi/strings.xml        |   1 -
 app/src/main/res/values-hr/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-kmr/strings.xml       |   1 -
 app/src/main/res/values-ko/strings.xml        |   1 -
 app/src/main/res/values-lt/strings.xml        |   1 -
 app/src/main/res/values-lv/strings.xml        |   1 -
 app/src/main/res/values-nb-rNO/strings.xml    |   1 -
 app/src/main/res/values-nl/strings.xml        |   1 -
 app/src/main/res/values-pa/strings.xml        |   1 -
 app/src/main/res/values-pl/strings.xml        |   1 -
 app/src/main/res/values-pt-rBR/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-sc/strings.xml        |   1 -
 app/src/main/res/values-si/strings.xml        |   1 -
 app/src/main/res/values-sl/strings.xml        |   1 -
 app/src/main/res/values-so/strings.xml        |   1 -
 app/src/main/res/values-sq/strings.xml        |   1 -
 app/src/main/res/values-sr/strings.xml        |   1 -
 app/src/main/res/values-sv/strings.xml        |   1 -
 app/src/main/res/values-ta/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-yue/strings.xml       |   1 -
 app/src/main/res/values-zh-rCN/strings.xml    |   1 -
 app/src/main/res/values-zh-rTW/strings.xml    |   1 -
 app/src/main/res/values/strings.xml           |   1 -
 58 files changed, 75 insertions(+), 412 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
index 895f2d51d..7bb833045 100644
--- a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
@@ -29,14 +29,6 @@ class AccountProvider private constructor(var context: Context) {
 
     companion object : SingletonHolder<AccountProvider, Context>(::AccountProvider)
 
-    fun isSignedIn(): Boolean {
-        return Preferences.getBoolean(context, Constants.ACCOUNT_SIGNED_IN)
-    }
-
-    fun getSignInTimeStamp(): Long {
-        return Preferences.getLong(context, Constants.ACCOUNT_SIGNED_TIMESTAMP)
-    }
-
     fun getAccountType(): AccountType {
         val rawType = Preferences.getString(context, Constants.ACCOUNT_TYPE)
         return when (rawType) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
index adc03b46c..a41f89c8e 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
@@ -22,7 +22,6 @@ package com.aurora.store.view.ui.account
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import coil.load
 import coil.transform.RoundedCornersTransformation
@@ -30,13 +29,10 @@ import com.aurora.Constants.URL_DISCLAIMER
 import com.aurora.Constants.URL_LICENSE
 import com.aurora.Constants.URL_TOS
 import com.aurora.extensions.browse
-import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.store.R
-import com.aurora.store.data.AuthState
 import com.aurora.store.data.providers.AccountProvider
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.FragmentAccountBinding
-import com.aurora.store.viewmodel.auth.AuthViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -46,17 +42,11 @@ class AccountFragment : Fragment(R.layout.fragment_account) {
     private val binding: FragmentAccountBinding
         get() = _binding!!
 
-    private val viewModel: AuthViewModel by activityViewModels()
-
-    private lateinit var authData: AuthData
-    private lateinit var accountProvider: AccountProvider
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentAccountBinding.bind(view)
 
-        authData = AuthProvider.with(view.context).getAuthData()
-        accountProvider = AccountProvider.with(view.context)
+        val authData = AuthProvider.with(view.context).getAuthData()
 
         // Toolbar
         binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_account_manager)
@@ -71,49 +61,22 @@ class AccountFragment : Fragment(R.layout.fragment_account) {
             binding.chipTos.setOnClickListener { browse(URL_TOS) }
         }
 
-        attachActions()
-
-        updateContents()
-
-        viewModel.liveData.observe(viewLifecycleOwner) {
-            when (it) {
-                AuthState.Fetching -> {
-                    updateStatus(getString(R.string.requesting_new_session))
-                }
-
-                AuthState.Valid -> {
-
-                }
-
-                AuthState.Available -> {
-                    updateStatus(getString(R.string.session_verifying))
-                    updateActionLayout(false)
-                }
-
-                AuthState.Unavailable -> {
-                    updateStatus(getString(R.string.session_login))
-                    updateActionLayout(true)
-                }
-
-                AuthState.SignedIn -> {
-                    updateContents()
-                }
-
-                AuthState.SignedOut -> {
-                    updateStatus(getString(R.string.session_scrapped))
-                    updateActionLayout(true)
-                }
-
-                AuthState.Verifying -> {
-                    updateStatus(getString(R.string.verifying_new_session))
-                }
-
-                is AuthState.Failed -> {
-                    updateStatus(it.status)
-                    updateActionLayout(true)
-                    resetActions()
-                }
+        authData.userProfile?.let {
+            val avatar = if (authData.isAnonymous) R.mipmap.ic_launcher else it.artwork.url
+            binding.imgAvatar.load(avatar) {
+                placeholder(R.drawable.bg_placeholder)
+                transformations(RoundedCornersTransformation(32F))
             }
+            binding.txtName.text = if (authData.isAnonymous) "Anonymous" else it.name
+            binding.txtEmail.text = if (authData.isAnonymous) "anonymous@gmail.com" else it.email
+        }
+
+        binding.btnLogout.addOnClickListener {
+            binding.btnLogout.updateProgress(true)
+            AccountProvider.with(view.context).logout()
+            findNavController().navigate(
+                AccountFragmentDirections.actionAccountFragmentToSplashFragment()
+            )
         }
     }
 
@@ -121,103 +84,4 @@ class AccountFragment : Fragment(R.layout.fragment_account) {
         super.onDestroyView()
         _binding = null
     }
-
-    private fun updateContents() {
-        if (accountProvider.isSignedIn()) {
-            binding.viewFlipper.displayedChild = 1
-            updateStatus(getString(R.string.session_good))
-        } else {
-            binding.viewFlipper.displayedChild = 0
-            updateStatus(getString(R.string.session_enjoy))
-        }
-
-        updateUserProfile()
-    }
-
-    private fun updateStatus(string: String?) {
-        activity?.runOnUiThread {
-            binding.txtStatus.apply {
-                text = string
-            }
-        }
-    }
-
-    private fun updateActionLayout(isVisible: Boolean) {
-        if (isVisible) {
-            binding.layoutAction.visibility = View.VISIBLE
-        } else {
-            binding.layoutAction.visibility = View.INVISIBLE
-        }
-    }
-
-    private fun attachActions() {
-        binding.btnAnonymous.updateProgress(false)
-        binding.btnGoogle.updateProgress(false)
-
-        binding.btnAnonymous.addOnClickListener {
-            if (viewModel.liveData.value != AuthState.Fetching) {
-                binding.btnAnonymous.updateProgress(true)
-                viewModel.buildAnonymousAuthData()
-            }
-        }
-
-        binding.btnGoogle.addOnClickListener {
-            if (viewModel.liveData.value != AuthState.Fetching) {
-                binding.btnGoogle.updateProgress(true)
-                findNavController().navigate(
-                    AccountFragmentDirections.actionAccountFragmentToGoogleFragment(
-                        R.id.accountFragment
-                    )
-                )
-            }
-        }
-
-        binding.btnLogout.addOnClickListener {
-            AccountProvider.with(it.context).logout()
-            binding.btnAnonymous.updateProgress(false)
-            binding.btnGoogle.updateProgress(false)
-            updateContents()
-        }
-    }
-
-    private fun resetActions() {
-        binding.btnGoogle.apply {
-            updateProgress(false)
-            isEnabled = true
-        }
-
-        binding.btnAnonymous.apply {
-            updateProgress(false)
-            isEnabled = true
-        }
-    }
-
-    private fun updateUserProfile() {
-        authData = AuthProvider.with(requireContext()).getAuthData()
-
-        if (accountProvider.isSignedIn()) {
-            authData.userProfile?.let {
-                binding.imgAvatar.load(it.artwork.url) {
-                    placeholder(R.drawable.bg_placeholder)
-                    transformations(RoundedCornersTransformation(32F))
-                }
-
-                binding.txtName.text = if (authData.isAnonymous)
-                    "Anonymous"
-                else
-                    it.name
-
-                binding.txtEmail.text = if (authData.isAnonymous)
-                    "anonymous@gmail.com"
-                else
-                    it.email
-            }
-        } else {
-            binding.imgAvatar.load(R.mipmap.ic_launcher) {
-                transformations(RoundedCornersTransformation(32F))
-            }
-            binding.txtName.text = getString(R.string.app_name)
-            binding.txtEmail.text = getString(R.string.account_logged_out)
-        }
-    }
 }
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt
index cc079290d..deaaa4757 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt
@@ -32,7 +32,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
 import com.aurora.store.R
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.databinding.FragmentGoogleBinding
@@ -46,7 +45,6 @@ import org.greenrobot.eventbus.ThreadMode
 @AndroidEntryPoint
 class GoogleFragment : Fragment(R.layout.fragment_google) {
 
-    private val args: GoogleFragmentArgs by navArgs()
     private val viewModel: AuthViewModel by activityViewModels()
 
     companion object {
@@ -146,19 +144,9 @@ class GoogleFragment : Fragment(R.layout.fragment_google) {
                     ).show()
                 }
 
-                when (args.destination) {
-                    R.id.splashFragment -> {
-                        findNavController().navigate(
-                            GoogleFragmentDirections.actionGoogleFragmentToSplashFragment()
-                        )
-                    }
-
-                    R.id.accountFragment -> {
-                        findNavController().navigate(
-                            GoogleFragmentDirections.actionGoogleFragmentToAccountFragment()
-                        )
-                    }
-                }
+                findNavController().navigate(
+                    GoogleFragmentDirections.actionGoogleFragmentToSplashFragment()
+                )
             }
 
             else -> {}
diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
index 032a45940..4b300eb1a 100644
--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
@@ -162,11 +162,7 @@ class SplashFragment : Fragment(R.layout.fragment_splash) {
     }
 
     private fun updateStatus(string: String?) {
-        activity?.runOnUiThread {
-            binding.txtStatus.apply {
-                text = string
-            }
-        }
+        activity?.runOnUiThread { binding.txtStatus.text = string }
     }
 
     private fun updateActionLayout(isVisible: Boolean) {
@@ -197,11 +193,7 @@ class SplashFragment : Fragment(R.layout.fragment_splash) {
         binding.btnGoogle.addOnClickListener {
             if (viewModel.liveData.value != AuthState.Fetching) {
                 binding.btnGoogle.updateProgress(true)
-                findNavController().navigate(
-                    SplashFragmentDirections.actionSplashFragmentToGoogleFragment(
-                        R.id.splashFragment
-                    )
-                )
+                findNavController().navigate(R.id.googleFragment)
             }
         }
     }
@@ -230,6 +222,7 @@ class SplashFragment : Fragment(R.layout.fragment_splash) {
                 2 -> SplashFragmentDirections.actionSplashFragmentToUpdatesFragment()
                 else -> SplashFragmentDirections.actionSplashFragmentToNavigationApps()
             }
+        activity?.viewModelStore?.clear() // Clear ViewModelStore to avoid bugs with logout
         findNavController().navigate(directions)
     }
 
diff --git a/app/src/main/res/layout-land/fragment_account.xml b/app/src/main/res/layout-land/fragment_account.xml
index 6226f5683..dfa6e6e7d 100644
--- a/app/src/main/res/layout-land/fragment_account.xml
+++ b/app/src/main/res/layout-land/fragment_account.xml
@@ -112,91 +112,34 @@
                 tools:text="auroraoss@gmail.com" />
         </RelativeLayout>
 
-        <ViewFlipper
-            android:id="@+id/view_flipper"
+        <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:gravity="center_horizontal|center_vertical"
+            android:orientation="vertical"
+            android:padding="@dimen/padding_large"
+            android:visibility="invisible"
+            tools:visibility="visible">
 
-            <RelativeLayout
-                android:id="@+id/layout_action"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_horizontal|center_vertical"
-                android:orientation="vertical"
-                android:padding="@dimen/padding_large"
-                android:visibility="invisible"
-                tools:visibility="visible">
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/txt_logout_action"
+                style="@style/AuroraTextStyle.Line1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/btn_logout"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/margin_normal"
+                android:text="@string/account_logout"
+                android:textAlignment="center" />
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/txt_action"
-                    style="@style/AuroraTextStyle.Line1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="@dimen/margin_normal"
-                    android:text="@string/account_login_using"
-                    android:textAlignment="center" />
-
-                <com.aurora.store.view.custom.layouts.button.StateButton
-                    android:id="@+id/btn_google"
-                    android:layout_width="@dimen/width_button"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/txt_action"
-                    android:layout_centerHorizontal="true"
-                    app:btnStateIcon="@drawable/ic_google"
-                    app:btnStateText="@string/account_google" />
-
-                <com.aurora.store.view.custom.layouts.button.StateButton
-                    android:id="@+id/btn_anonymous"
-                    android:layout_width="@dimen/width_button"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/btn_google"
-                    android:layout_centerHorizontal="true"
-                    app:btnStateIcon="@drawable/ic_anonymous"
-                    app:btnStateText="@string/account_anonymous" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/txt_status"
-                    style="@style/AuroraTextStyle.Line2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/margin_small"
-                    android:textAlignment="center"
-                    tools:text="Status" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_horizontal|center_vertical"
-                android:orientation="vertical"
-                android:padding="@dimen/padding_large"
-                android:visibility="invisible"
-                tools:visibility="visible">
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/txt_logout_action"
-                    style="@style/AuroraTextStyle.Line1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_above="@id/btn_logout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="@dimen/margin_normal"
-                    android:text="@string/account_logout"
-                    android:textAlignment="center" />
-
-                <com.aurora.store.view.custom.layouts.button.StateButton
-                    android:id="@+id/btn_logout"
-                    android:layout_width="@dimen/width_button"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    app:btnStateIcon="@drawable/ic_logout"
-                    app:btnStateText="@string/action_logout" />
-            </RelativeLayout>
-
-        </ViewFlipper>
+            <com.aurora.store.view.custom.layouts.button.StateButton
+                android:id="@+id/btn_logout"
+                android:layout_width="@dimen/width_button"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                app:btnStateIcon="@drawable/ic_logout"
+                app:btnStateText="@string/action_logout" />
+        </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 4eead50ae..f215cf5a1 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -106,90 +106,31 @@
             tools:text="auroraoss@gmail.com" />
     </RelativeLayout>
 
-    <ViewFlipper
-        android:id="@+id/view_flipper"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:gravity="center_horizontal|center_vertical"
+        android:orientation="vertical"
+        android:padding="@dimen/padding_large">
 
-        <RelativeLayout
-            android:id="@+id/layout_action"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal|center_vertical"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_large"
-            android:visibility="invisible"
-            tools:visibility="visible">
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/txt_logout_action"
+            style="@style/AuroraTextStyle.Line1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/btn_logout"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/margin_normal"
+            android:text="@string/account_logout"
+            android:textAlignment="center" />
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/txt_action"
-                style="@style/AuroraTextStyle.Line1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="@dimen/margin_normal"
-                android:text="@string/account_login_using"
-                android:textAlignment="center" />
-
-            <com.aurora.store.view.custom.layouts.button.StateButton
-                android:id="@+id/btn_google"
-                android:layout_width="@dimen/width_button"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txt_action"
-                android:layout_centerHorizontal="true"
-                app:btnStateIcon="@drawable/ic_google"
-                app:btnStateText="@string/account_google" />
-
-            <com.aurora.store.view.custom.layouts.button.StateButton
-                android:id="@+id/btn_anonymous"
-                android:layout_width="@dimen/width_button"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/btn_google"
-                android:layout_centerHorizontal="true"
-                app:btnStateIcon="@drawable/ic_anonymous"
-                app:btnStateText="@string/account_anonymous" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/txt_status"
-                style="@style/AuroraTextStyle.Line2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textAlignment="center"
-                tools:text="Status" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal|center_vertical"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_large"
-            android:visibility="invisible"
-            tools:visibility="visible">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/txt_logout_action"
-                style="@style/AuroraTextStyle.Line1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@id/btn_logout"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="@dimen/margin_normal"
-                android:text="@string/account_logout"
-                android:textAlignment="center" />
-
-            <com.aurora.store.view.custom.layouts.button.StateButton
-                android:id="@+id/btn_logout"
-                android:layout_width="@dimen/width_button"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                app:btnStateIcon="@drawable/ic_logout"
-                app:btnStateText="@string/action_logout" />
-        </RelativeLayout>
-
-    </ViewFlipper>
+        <com.aurora.store.view.custom.layouts.button.StateButton
+            android:id="@+id/btn_logout"
+            android:layout_width="@dimen/width_button"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            app:btnStateIcon="@drawable/ic_logout"
+            app:btnStateText="@string/action_logout" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 45924712e..a41f2198d 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -99,8 +99,11 @@
         android:label="@string/title_account_manager"
         tools:layout="@layout/fragment_account" >
         <action
-            android:id="@+id/action_accountFragment_to_googleFragment"
-            app:destination="@id/googleFragment" />
+            android:id="@+id/action_accountFragment_to_splashFragment"
+            app:destination="@id/splashFragment"
+            app:launchSingleTop="true"
+            app:popUpTo="@id/mobile_navigation"
+            app:popUpToInclusive="true" />
     </fragment>
     <fragment
         android:id="@+id/settingsFragment"
@@ -351,9 +354,6 @@
             app:launchSingleTop="true"
             app:popUpTo="@id/mobile_navigation"
             app:popUpToInclusive="true" />
-        <action
-            android:id="@+id/action_splashFragment_to_googleFragment"
-            app:destination="@id/googleFragment" />
         <action
             android:id="@+id/action_splashFragment_to_appDetailsFragment"
             app:destination="@id/appDetailsFragment"
@@ -370,13 +370,6 @@
             app:destination="@id/splashFragment"
             app:popUpTo="@id/splashFragment"
             app:popUpToInclusive="true" />
-        <action
-            android:id="@+id/action_googleFragment_to_accountFragment"
-            app:destination="@id/accountFragment"
-            app:popUpTo="@id/accountFragment"
-            app:popUpToInclusive="true" />
-        <argument android:name="destination"
-            app:argType="integer" />
     </fragment>
     <fragment
         android:id="@+id/onboardingFragment"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 905f4284a..deee58bc8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -201,7 +201,6 @@
     <string name="action_back">رجوع</string>
     <string name="account_logout">تسجيل الخروج من Aurora</string>
     <string name="account_login_using">تسجيل الدخول باستخدام</string>
-    <string name="account_logged_out">لقد تم تسجيل خروجك</string>
     <string name="account_anonymous">حساب مجهول</string>
     <string name="about_xda_summary">اطلع على موضوع Aurora Store على XDA للمناقشات أو الاقتراحات.</string>
     <string name="about_xda">موضوع المطور</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 32ca4bd5b..08d99fd21 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -133,7 +133,6 @@
     <string name="action_install">Instalar</string>
     <string name="toast_anonymous_restriction">Nun ta disponible nes cuentes anónimes</string>
     <string name="action_share">Compartir</string>
-    <string name="account_logged_out">Zarresti la sesión</string>
     <string name="onboarding_permission_select">Aurora Store rique los permisos siguientes</string>
     <string name="download_cancel_all">Encaboxar too</string>
     <string name="details_no_app_match">Nun s\'atopó nenguna aplicación que concasare</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 2d0d53784..c6ee85baf 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -118,7 +118,6 @@
     <string name="action_copy">Kopyalayın</string>
     <string name="action_copy_link">Linki Kopyalayın</string>
     <string name="action_disable">Deaktiv edin</string>
-    <string name="account_logged_out">Çıxıldı</string>
     <string name="account_anonymous_insecure">Anonim (təhlükəli)</string>
     <string name="details_no_app_match">Uyğun tətbiq tapılmadı</string>
     <string name="details_no_dependencies">Asılılıq yoxdur</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index b5684868d..efb0a51a7 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -27,7 +27,6 @@
     <string name="action_filter_apply">Прилагане</string>
     <string name="account_anonymous_insecure">Анонимен (несигурен)</string>
     <string name="account_google">Google</string>
-    <string name="account_logged_out">Вие сте излезли</string>
     <string name="account_login_using">Влизане чрез</string>
     <string name="account_logout">Излизане от Aurora</string>
     <string name="action_back">Назад</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 5a23f09c3..9277d1158 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -21,7 +21,6 @@
     <string name="action_blacklist_add">অবরোধ তালিকায় যোগ</string>
     <string name="account_logout">অরোরা থেকে প্রস্থান করো</string>
     <string name="account_login_using">প্রবেশের জন্য ব্যবহার করো</string>
-    <string name="account_logged_out">তুমি প্রস্থানকৃত</string>
     <string name="about_xda">ডেভ সূত্র</string>
     <string name="about_paypal_summary">পেপাল দিয়ে অনুদান দাও</string>
     <string name="about_libera_summary">লিবেরাপে এ সমর্থক হও</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c9041153d..a7076d63a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -27,7 +27,6 @@
     <string name="about_paypal_summary">Dona a través de PayPal</string>
     <string name="account_anonymous_insecure">Anònim (insegur)</string>
     <string name="account_google">Google</string>
-    <string name="account_logged_out">Heu tancat la sessió</string>
     <string name="account_login_using">Inicia la sessió via</string>
     <string name="account_logout">Sortir d\'Aurora</string>
     <string name="action_next">Següent</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4a213717d..eb180ba1c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -223,7 +223,6 @@
     <string name="action_back">Zpět</string>
     <string name="account_logout">Odhlásit se z Aurory</string>
     <string name="account_login_using">Přihlaste se pomocí</string>
-    <string name="account_logged_out">Jste odhlášeni</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonymní</string>
     <string name="about_xda_summary">Diskuze a návrhy najdete na XDA stránce Aurora Store.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ea3c6dffe..1daa8b544 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -257,7 +257,6 @@
     <string name="about_xda">Udviklertråd</string>
     <string name="about_xda_summary">Se Aurora Store XDA thread (engelsksproget) for diskussioner eller forslag.</string>
     <string name="account_anonymous">Anonym</string>
-    <string name="account_logged_out">Du er logget ud</string>
     <string name="account_login_using">Log ind med</string>
     <string name="details_paid">Betalt</string>
     <string name="toast_manual_unavailable">Versionskoden du beder om er utilgængelig.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3d021fedf..217bd11e6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -214,7 +214,6 @@
     <string name="action_export">Exportieren</string>
     <string name="account_logout">Von Aurora abmelden</string>
     <string name="account_login_using">Anmelden mit</string>
-    <string name="account_logged_out">Du bist nicht angemeldet</string>
     <string name="about_paypal_summary">Mit PayPal spenden</string>
     <string name="tab_top_grossing">Erfolgreich</string>
     <string name="tab_editor_choice">Auswahl der Redaktion</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ca5699dbd..8c361b084 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -37,7 +37,6 @@
     <string name="action_back">Επιστροφή</string>
     <string name="account_logout">Αποσύνδεση από το Aurora</string>
     <string name="account_login_using">Σύνδεση με</string>
-    <string name="account_logged_out">Έχετε αποσυνδεθεί</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Ανώνυμος</string>
     <string name="about_telegram_summary">Γίνετε μέλος της ομάδας Υποστήριξης Aurora για συζητήσεις ή προτάσεις.</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 4286725b5..9fa06c092 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="account_logged_out">Vi estas elsalutita</string>
     <string name="account_google">Google</string>
     <string name="about_telegram">Telegram</string>
     <string name="about_paypal">PayPal</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 839e74cd3..a34648537 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -202,7 +202,6 @@
     <string name="action_back">Atrás</string>
     <string name="account_logout">Cerrar sesión de Aurora</string>
     <string name="account_login_using">Iniciar sesión con</string>
-    <string name="account_logged_out">Ha cerrado la sesión</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anónimo</string>
     <string name="about_xda_summary">Consulte el hilo de Aurora Store en XDA para debatir o hacer sugerencias.</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 8c30e4f37..7871b3dab 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -205,7 +205,6 @@
     <string name="action_back">Atzera</string>
     <string name="account_logout">Auroraren saioa itxi</string>
     <string name="account_login_using">Saioa hasi hau erabiliz</string>
-    <string name="account_logged_out">Saioa bertan utzi duzu</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Ezezaguna</string>
     <string name="about_xda_summary">Ikustazu Aurora Store-en garapen haria XDA-n eztabaidak eta iradokizunak aurkitzeko.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 80ca34f70..432eddba3 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -112,7 +112,6 @@
     <string name="action_update_all">به‌روزرسانی همه</string>
     <string name="action_back">عقب</string>
     <string name="about_bitcoin_bch_summary">حمایت از طریق بیتکوین کش (BCH)</string>
-    <string name="account_logged_out">شما خارج شدید</string>
     <string name="action_granted">مجوز داده شد</string>
     <string name="action_close">بستن</string>
     <string name="account_logout">خروج از آرورا</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 81a8edba4..531045560 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -10,7 +10,6 @@
     <string name="action_back">Takaisin</string>
     <string name="account_logout">Kirjaudu ulos Aurorasta</string>
     <string name="account_login_using">Kirjaudu sisään käyttäen</string>
-    <string name="account_logged_out">Olet kirjautunut ulos</string>
     <string name="account_google">Google</string>
     <string name="about_telegram">Telegram</string>
     <string name="about_paypal">PayPal</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5f87c79be..6bc1a1d2d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -156,7 +156,6 @@
     <string name="tab_editor_choice">Choix de l’équipe</string>
     <string name="title_apps">Applis</string>
     <string name="title_account_manager">Comptes</string>
-    <string name="account_logged_out">Vous êtes déconnecté·e</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonyme</string>
     <string name="about_xda">Fil de développement</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index d20a2fe48..5aba6721d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -175,7 +175,6 @@
     <string name="action_back">Volver</string>
     <string name="account_logout">Fechar sesión</string>
     <string name="account_login_using">Iniciar sesión con</string>
-    <string name="account_logged_out">Fechou a sesión</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anónimo</string>
     <string name="about_xda_summary">Visite o fío de Aurora Store no XDA para participar en discusións e suxestións.</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index dd1b67f00..d6d3b2e42 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -23,7 +23,6 @@
     <string name="title_account_manager">חשבונות</string>
     <string name="account_logout">התנתקות מ־Aurora</string>
     <string name="account_login_using">התחברות לחשבון</string>
-    <string name="account_logged_out">התנתקת</string>
     <string name="account_google">‏Google</string>
     <string name="details_more_about_app">עוד על היישום</string>
     <string name="details_ratings">דירוג וביקורות</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 192569e0c..44d0da4c6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -13,7 +13,6 @@
     <string name="action_back">वापस जाएं</string>
     <string name="account_logout">Aurora से लॉगआउट करें</string>
     <string name="account_login_using">इसके द्वारा लॉगिन करें</string>
-    <string name="account_logged_out">आप लॉगआउट हैं</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">अज्ञात</string>
     <string name="about_xda_summary">चर्चा या सुझाव के लिए Aurora Store XDA थ्रेड देखें।</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 20f5dce62..b306959c5 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -61,7 +61,6 @@
     <string name="action_back">Natrag</string>
     <string name="account_logout">Odjavi se iz Aurore</string>
     <string name="account_login_using">Prijavi se, koristeći</string>
-    <string name="account_logged_out">Odjavljen/a si</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonimno</string>
     <string name="about_xda_summary">Pregledaj rasprave ili prijedloge u XDA razgovorima Aurora trgovine.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8fc0f05c6..0948b52f9 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -59,7 +59,6 @@
     <string name="action_back">Vissza</string>
     <string name="account_logout">Kijelentkezés az Aurorából</string>
     <string name="account_login_using">Bejelentkezés ezzel</string>
-    <string name="account_logged_out">Kijelentkeztél</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonim</string>
     <string name="about_xda_summary">Nézd meg az Aurora Store XDA témát beszélgetéshez és javaslatokért.</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 9527d7f76..ff7720a32 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -44,7 +44,6 @@
     <string name="action_filter_apps_with_ads">Aplikasi dengan iklan</string>
     <string name="action_filter_apply">Terapkan</string>
     <string name="action_filter_all">Semua</string>
-    <string name="account_logged_out">Anda telah keluar</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonim</string>
     <string name="about_xda_summary">Lihat utas Aurora Store XDA untuk diskusi atau saran.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 93958fb5f..8722647fd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -130,7 +130,6 @@
     <string name="action_back">Indietro</string>
     <string name="account_logout">Esci da Aurora</string>
     <string name="account_login_using">Accedi usando</string>
-    <string name="account_logged_out">Sei stato/a disconnesso/a</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonimo</string>
     <string name="about_telegram">Telegram</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d81ecac90..48b91ab00 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,7 +3,6 @@
     <string name="details_dev_website">ウェブサイト</string>
     <string name="details_dev_email">電子メール</string>
     <string name="account_login_using">次の方法でログイン</string>
-    <string name="account_logged_out">ログアウトしました</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">匿名</string>
     <string name="about_xda_summary">Aurora Store の XDA スレッドを見て、議論や提案をしましょう。</string>
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
index 08e98b45b..cad660f0c 100644
--- a/app/src/main/res/values-kmr/strings.xml
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -200,7 +200,6 @@
     <string name="action_back">Paş</string>
     <string name="account_logout">ji Aurora-yê derkeve</string>
     <string name="account_login_using">Bikaranîna têketinê</string>
-    <string name="account_logged_out">Hûn derketin</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Bênav</string>
     <string name="about_xda_summary">Ji bo nîqaş an pêşniyaran mijara Aurora Store XDA bibînin.</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c4e3d988c..c7cb97889 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -24,7 +24,6 @@
     <string name="about_telegram_summary">토론이나 제안을 위해 Aurora 지원 그룹에 가입하세요.</string>
     <string name="account_anonymous">익명</string>
     <string name="account_google">구글</string>
-    <string name="account_logged_out">로그아웃되었습니다</string>
     <string name="action_blacklist_add">블랙리스트에 추가</string>
     <string name="action_blacklist">블랙리스트</string>
     <string name="action_open">열기</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 7d04f185e..cca78535f 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -117,7 +117,6 @@
     <string name="notification_channel_updater_service">Foninio programėlių atsisiuntimo tarnyba</string>
     <string name="title_library">Biblioteka</string>
     <string name="about_paypal_summary">Paaukoti per „PayPal“</string>
-    <string name="account_logged_out">Esate atsijungę</string>
     <string name="account_login_using">Prisijungti naudojant</string>
     <string name="action_blacklist">Juodasis sąrašas</string>
     <string name="action_blacklist_add">Pridėti į juodąjį sąrašą</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 33064745a..44fd1b575 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -41,7 +41,6 @@
     <string name="action_back">Atpakaļ</string>
     <string name="account_logout">Atteikties no Aurora</string>
     <string name="account_login_using">Pieteikties ar</string>
-    <string name="account_logged_out">Atteicies</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonīms</string>
     <string name="about_telegram_summary">Pievienojaties Aurora Atbalsta grupai priekš diskusijām vai ieteikumiem.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 9be146d7f..42be83b29 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -119,7 +119,6 @@
     <string name="action_blacklist">Svartelist</string>
     <string name="action_back">Tilbake</string>
     <string name="account_login_using">Logg inn med</string>
-    <string name="account_logged_out">Du er utlogget</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonym</string>
     <string name="about_xda">Utviklingstråd</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6c42576dc..eb353d69f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -13,7 +13,6 @@
     <string name="details_dev_address">Adres</string>
     <string name="details_description">Beschrijving</string>
     <string name="details_dev_email">E-mail</string>
-    <string name="account_logged_out">U bent afgemeld</string>
     <string name="about_bitcoin_bch_summary">Doneer met Bitcoin Cash (BCH)</string>
     <string name="about_bitcoin_btc_summary">Doneer met Bitcoin (BTC)</string>
     <string name="about_bhim_summary">Doneer met UPI</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index a54fbbfcd..856c706e5 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -236,7 +236,6 @@
     <string name="action_back">ਪਿੱਛੇ</string>
     <string name="account_logout">ਲੌਗ-ਆਊਟ ਕਰੋ</string>
     <string name="account_login_using">ਕਿਰਪਾ ਕਰਕੇ ਲੌਗ-ਇਨ ਕਰਨ ਦਾ ਜ਼ਰੀਆ ਚੁਣੋ</string>
-    <string name="account_logged_out">ਤੁਸੀਂ ਲੌਗ-ਆਊਟ ਹੋ ਚੁੱਕੇ ਹੋ</string>
     <string name="account_google">ਗੂਗਲ ਖਾਤਾ</string>
     <string name="account_anonymous">ਅਗਿਆਤ</string>
     <string name="about_xda_summary">ਕੋਈ ਚਰਚਾ ਜਾਂ ਸੁਝਾਅ ਵਾਸਤੇ ਔਰੋਰਾ ਸਟੋਰ ਦੀ XDA ਵੈੱਬਸਾਈਟ ਵੇਖੋ।</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5f31e4a6d..8e9a46783 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -68,7 +68,6 @@
     <string name="action_back">Wstecz</string>
     <string name="account_logout">Wyloguj się z Aurory</string>
     <string name="account_login_using">Zaloguj się za pomocą konta</string>
-    <string name="account_logged_out">Nie jesteś zalogowany</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonimowe</string>
     <string name="about_xda_summary">Zobacz wątek Aurora Store XDA, aby móc dyskutować i proponować sugestie.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0c3684471..29b8d7394 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -179,7 +179,6 @@
     <string name="action_cancel">Cancelar</string>
     <string name="action_blacklist">Lista negra</string>
     <string name="action_back">Voltar</string>
-    <string name="account_logged_out">Você está desconectado</string>
     <string name="account_anonymous">Anônimo</string>
     <string name="about_xda_summary">Veja o tópico da Aurora Store no XDA para discussões ou sugestões.</string>
     <string name="about_telegram_summary">Junte-se ao grupo de suporte da Aurora para discussões ou sugestões.</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 5d0c06bc9..28270d4e0 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -250,7 +250,6 @@
     <string name="action_back">Recuar</string>
     <string name="account_logout">Terminar sessão</string>
     <string name="account_login_using">Iniciar sessão com</string>
-    <string name="account_logged_out">Sem sessão iniciada</string>
     <string name="toast_export_failed">Não foi possível exportar a configuração do dispositivo</string>
     <string name="toast_export_success">Configuração do dispositivo exportada</string>
     <string name="app_updater_service_notif_text">Permite descarregar aplicações em segundo plano</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1abccef72..187c14305 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -69,7 +69,6 @@
     <string name="action_filter_paid_apps">Cu plată</string>
     <string name="action_filter_rating">Evaluări</string>
     <string name="action_finish">Finalizare</string>
-    <string name="account_logged_out">Ești deconectat</string>
     <string name="account_login_using">Conectează-te utilizând</string>
     <string name="download_force_clear_all">Șterge forțat totul</string>
     <string name="account_logout">Deconectează-te de la Aurora</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 04c41f70c..a628353a3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -48,7 +48,6 @@
     <string name="action_back">Назад</string>
     <string name="account_logout">Выйти из Aurora</string>
     <string name="account_login_using">Войти с помощью</string>
-    <string name="account_logged_out">Вы вышли из аккаунта</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Анонимный</string>
     <string name="about_telegram_summary">Присоединяйтесь к группе поддержки Aurora для обсуждения или предложений.</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 184c981d3..7f90f1790 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -4,7 +4,6 @@
     <string name="about_libera_summary">Diveni unu sustenidore in Liberapay</string>
     <string name="about_paypal">PayPal</string>
     <string name="account_anonymous_insecure">Anònimu (non seguru)</string>
-    <string name="account_logged_out">Ses istadu iscollegadu</string>
     <string name="account_login_using">Intra impreende</string>
     <string name="account_logout">Essi dae Aurora</string>
     <string name="action_back">In segus</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index b62a856be..45d005f12 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -203,7 +203,6 @@
     <string name="about_libera_summary">ලිබෙරාපේ හරහා සම්පාදකයෙකු වන්න</string>
     <string name="about_xda_summary">සාකච්ඡා හා යෝජනා සඳහා අවුරෝරා ස්ටෝර් XDA පිටුව බලන්න.</string>
     <string name="account_anonymous_insecure">නිර්නාමික (අනාරක්‍ෂිත)</string>
-    <string name="account_logged_out">ඔබ නික්ම ඇත</string>
     <string name="action_filter_gsf_dependent_apps">GSF මත යැපෙයි</string>
     <string name="action_filter_misc">ප්‍රකීර්ණ</string>
     <string name="ui_accent_4">රත්රන්</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 5ff4fa8a4..68109cc62 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -21,7 +21,6 @@
     <string name="about_xda_summary">Za razpravo in predloge obiščite Aurora Store XDA forum.</string>
     <string name="account_anonymous">Anonimno</string>
     <string name="account_anonymous_insecure">Anonimno (ni varno)</string>
-    <string name="account_logged_out">Trenutno ste odjavljeni</string>
     <string name="account_logout">Odjavite se iz Aurora</string>
     <string name="action_back">Nazaj</string>
     <string name="action_blacklist">Črni seznam</string>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 620dd9d21..1ea2d13ce 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -246,7 +246,6 @@
     <string name="action_back">Kanoqo</string>
     <string name="account_logout">Kabax Aurora</string>
     <string name="account_login_using">Gal adoo isticmaalaya</string>
-    <string name="account_logged_out">Waad ka baxday</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Garanwaa</string>
     <string name="about_xda_summary">Fiiri Aurora Store qormadooda xaga XDA si aad doodaha ama soojeedinada oga qayb qaadato.</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 4e3daad28..7d6031548 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -29,7 +29,6 @@
     <string name="tab_for_you">Për ju</string>
     <string name="account_anonymous">Anonim</string>
     <string name="account_google">Google</string>
-    <string name="account_logged_out">Keni dalë nga llogaria</string>
     <string name="account_login_using">Bëni hyrjen duke përdorur</string>
     <string name="account_logout">Dil nga Aurora</string>
     <string name="action_back">Mbprasht</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 258726669..47fa109a0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -206,7 +206,6 @@
     <string name="action_back">Назад</string>
     <string name="account_logout">Одјавите се из Aurore</string>
     <string name="account_login_using">Пријавите се користећи</string>
-    <string name="account_logged_out">Одјављени сте</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Анонимно</string>
     <string name="about_xda_summary">Погледајте Aurora Store XDA форум за дискусије или предлоге.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2113a50c6..64957ab28 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -185,7 +185,6 @@
     <string name="action_blacklist">Svartlista</string>
     <string name="action_back">Bakåt</string>
     <string name="account_logout">Logga ut från Aurora</string>
-    <string name="account_logged_out">Du är utloggad</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonym</string>
     <string name="about_xda_summary">Se Aurora-butikens XDA-tråd för diskussioner eller förslag.</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index a2e720743..d8628f374 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -42,7 +42,6 @@
     <string name="action_back">பின்செல்க</string>
     <string name="account_logout">அரோராவிலிருந்து வெளியேறவும்</string>
     <string name="account_login_using">பயன்படுத்தி உள்நுழையவும்</string>
-    <string name="account_logged_out">நீங்கள் வெளியேறிவிட்டீர்கள்</string>
     <string name="account_google">கூகிள்</string>
     <string name="about_xda_summary">விவாதங்கள் அல்லது பரிந்துரைகளுக்கு அரோரா ஸ்டோர் எக்ஸ்.டி.ஏ நூலைப் பார்க்கவும்.</string>
     <string name="about_xda">தேவ் நூல்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a791c1f06..f23b6b77f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,7 +12,6 @@
     <string name="action_back">Geri</string>
     <string name="account_logout">Aurora\'dan çıkış yap</string>
     <string name="account_login_using">Şununla giriş yap</string>
-    <string name="account_logged_out">Çıkış yaptınız</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Anonim</string>
     <string name="about_xda_summary">Tartışmalar veya öneriler için Aurora Store XDA başlığına bakın.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 48cef11a5..4fc91357e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -97,7 +97,6 @@
     <string name="action_back">Назад</string>
     <string name="account_logout">Вийти з Aurora</string>
     <string name="account_login_using">Увійти за допомогою</string>
-    <string name="account_logged_out">Ви вийшли з акаунта</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Анонімно</string>
     <string name="about_xda_summary">Переглянути розділ Aurora Store на XDA для обговорень чи пропозицій.</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index d26bb7f3b..b362b97c7 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -63,7 +63,6 @@
     <string name="action_back">Trở về</string>
     <string name="account_logout">Đăng xuất khỏi Aurora</string>
     <string name="account_login_using">Đăng nhập bằng</string>
-    <string name="account_logged_out">Bạn đã đăng xuất</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">Ẩn danh</string>
     <string name="about_xda_summary">Xem chủ đề XDA Aurora Store để thảo luận và góp ý.</string>
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index fab55517b..9a13d6f70 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -5,7 +5,6 @@
     <string name="about_gitlab">GitLab</string>
     <string name="about_paypal">PayPal</string>
     <string name="account_google">Google</string>
-    <string name="account_logged_out">您已經登出咗</string>
     <string name="account_logout">登出 Aurora</string>
     <string name="action_back">返轉頭</string>
     <string name="action_cancel">取消</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 20a24a9de..b7878a6ef 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -91,7 +91,6 @@
     <string name="action_back">返回</string>
     <string name="account_logout">登出 Aurora</string>
     <string name="account_login_using">登录方式</string>
-    <string name="account_logged_out">您已退出登录</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">匿名</string>
     <string name="about_xda_summary">前往 Aurora Store 的 XDA 主题以参与讨论或提出建议。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5e3871e5c..2a62e8283 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -45,7 +45,6 @@
     <string name="action_back">返回</string>
     <string name="account_logout">登出 Aurora</string>
     <string name="account_login_using">登入通過</string>
-    <string name="account_logged_out">您已經登出了</string>
     <string name="account_google">Google</string>
     <string name="account_anonymous">匿名</string>
     <string name="about_xda_summary">檢視 Aurora 商店的 XDA 討論串來討論或提供意見。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b8428b5f..daf936f19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,7 +44,6 @@
     <string name="account_anonymous">"Anonymous"</string>
     <string name="account_anonymous_insecure">"Anonymous (insecure)"</string>
     <string name="account_google">"Google"</string>
-    <string name="account_logged_out">"You are logged out"</string>
     <string name="account_login_using">Log in using</string>
     <string name="account_logout">Log out from Aurora</string>
     <string name="action_back">"Back"</string>