From 960b99d6f3221d910362cd5d51d7f62e5b7b7c4e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 31 Mar 2018 14:24:08 +0200
Subject: [PATCH] fix #156, properly switch language after toggling Use english

---
 app/build.gradle                              |  2 +-
 .../filemanager/activities/MainActivity.kt    | 20 -------------------
 .../activities/SettingsActivity.kt            |  7 +++++--
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e27e7ff8..606e871e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.17.17'
+    implementation 'com.simplemobiletools:commons:3.17.19'
 
     implementation files('../libs/RootTools.jar')
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
index 1bee80e8..48c16ad1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
@@ -38,8 +38,6 @@ class MainActivity : SimpleActivity() {
     private var wasBackJustPressed = false
     private var searchMenuItem: MenuItem? = null
 
-    private var storedUseEnglish = false
-
     private lateinit var fragment: ItemsFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -59,20 +57,6 @@ class MainActivity : SimpleActivity() {
 
         checkWhatsNewDialog()
         checkIfRootAvailable()
-        storeStateVariables()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (storedUseEnglish != config.useEnglish) {
-            restartActivity()
-            return
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        storeStateVariables()
     }
 
     override fun onStop() {
@@ -132,10 +116,6 @@ class MainActivity : SimpleActivity() {
         openPath(savedInstanceState.getString(PICKED_PATH), true)
     }
 
-    private fun storeStateVariables() {
-        storedUseEnglish = config.useEnglish
-    }
-
     private fun setupSearch(menu: Menu) {
         val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
         searchMenuItem = menu.findItem(R.id.search)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
index b6a2d61d..6ce657cc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
@@ -4,7 +4,10 @@ import android.content.Intent
 import android.os.Bundle
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.SecurityDialog
-import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
+import com.simplemobiletools.commons.extensions.handleHiddenFolderPasswordProtection
+import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
 import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
 import com.simplemobiletools.filemanager.R
@@ -60,7 +63,7 @@ class SettingsActivity : SimpleActivity() {
         settings_use_english_holder.setOnClickListener {
             settings_use_english.toggle()
             config.useEnglish = settings_use_english.isChecked
-            useEnglishToggled()
+            System.exit(0)
         }
     }