Skip to content

Commit 960b99d

Browse files
committed
fix #156, properly switch language after toggling Use english
1 parent 09275e6 commit 960b99d

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ext {
4545
}
4646

4747
dependencies {
48-
implementation 'com.simplemobiletools:commons:3.17.17'
48+
implementation 'com.simplemobiletools:commons:3.17.19'
4949

5050
implementation files('../libs/RootTools.jar')
5151

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ class MainActivity : SimpleActivity() {
3838
private var wasBackJustPressed = false
3939
private var searchMenuItem: MenuItem? = null
4040

41-
private var storedUseEnglish = false
42-
4341
private lateinit var fragment: ItemsFragment
4442

4543
override fun onCreate(savedInstanceState: Bundle?) {
@@ -59,20 +57,6 @@ class MainActivity : SimpleActivity() {
5957

6058
checkWhatsNewDialog()
6159
checkIfRootAvailable()
62-
storeStateVariables()
63-
}
64-
65-
override fun onResume() {
66-
super.onResume()
67-
if (storedUseEnglish != config.useEnglish) {
68-
restartActivity()
69-
return
70-
}
71-
}
72-
73-
override fun onPause() {
74-
super.onPause()
75-
storeStateVariables()
7660
}
7761

7862
override fun onStop() {
@@ -132,10 +116,6 @@ class MainActivity : SimpleActivity() {
132116
openPath(savedInstanceState.getString(PICKED_PATH), true)
133117
}
134118

135-
private fun storeStateVariables() {
136-
storedUseEnglish = config.useEnglish
137-
}
138-
139119
private fun setupSearch(menu: Menu) {
140120
val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
141121
searchMenuItem = menu.findItem(R.id.search)

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import android.content.Intent
44
import android.os.Bundle
55
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
66
import com.simplemobiletools.commons.dialogs.SecurityDialog
7-
import com.simplemobiletools.commons.extensions.*
7+
import com.simplemobiletools.commons.extensions.beVisibleIf
8+
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
9+
import com.simplemobiletools.commons.extensions.handleHiddenFolderPasswordProtection
10+
import com.simplemobiletools.commons.extensions.updateTextColors
811
import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
912
import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
1013
import com.simplemobiletools.filemanager.R
@@ -60,7 +63,7 @@ class SettingsActivity : SimpleActivity() {
6063
settings_use_english_holder.setOnClickListener {
6164
settings_use_english.toggle()
6265
config.useEnglish = settings_use_english.isChecked
63-
useEnglishToggled()
66+
System.exit(0)
6467
}
6568
}
6669

0 commit comments

Comments
 (0)