From 38b40efac3fc46543bffb8f281a8956c438161ce Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 13 Dec 2019 15:24:44 +0100
Subject: [PATCH] Using default values

---
 .../im/vector/riotx/core/platform/VectorBaseActivity.kt    | 1 -
 .../features/settings/VectorSettingsGeneralFragment.kt     | 7 +------
 .../riotx/features/signout/soft/SoftLogoutActivity.kt      | 4 +---
 .../riotx/features/workers/signout/SignOutUiWorker.kt      | 7 +------
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
index c98b53b2da..02e28e079c 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
@@ -205,7 +205,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
         MainActivity.restartApp(this,
                 MainActivityArgs(
-                        clearCache = false,
                         clearCredentials = !globalError.softLogout,
                         isUserLoggedOut = true,
                         isSoftLogout = globalError.softLogout
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
index f9886a6ad5..17f440c3dc 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
@@ -177,12 +177,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
 
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 displayLoadingView()
-                MainActivity.restartApp(activity!!,
-                        MainActivityArgs(
-                                clearCache = true,
-                                clearCredentials = false
-                        )
-                )
+                MainActivity.restartApp(activity!!, MainActivityArgs(clearCache = true))
                 false
             }
         }
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
index 4d95835550..8d61fb00b5 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
@@ -87,9 +87,7 @@ class SoftLogoutActivity : LoginActivity() {
                 )
             }
             is SoftLogoutViewEvents.ClearData        -> {
-                MainActivity.restartApp(this, MainActivityArgs(
-                        clearCredentials = true
-                ))
+                MainActivity.restartApp(this, MainActivityArgs(clearCredentials = true))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
index abd15eb9e1..e51fda2be5 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
@@ -54,11 +54,6 @@ class SignOutUiWorker(private val activity: FragmentActivity) {
     }
 
     private fun doSignOut() {
-        MainActivity.restartApp(activity,
-                MainActivityArgs(
-                        clearCache = true,
-                        clearCredentials = true
-                )
-        )
+        MainActivity.restartApp(activity, MainActivityArgs(clearCredentials = true))
     }
 }