add requested changes

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -12,6 +12,7 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
 import chat.rocket.android.push.GroupedPush
+import chat.rocket.android.server.domain.GetCurrentLanguageInteractor
 import chat.rocket.android.server.domain.SaveCurrentLanguageInteractor
 import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
@@ -54,6 +55,7 @@ class MainPresenter @Inject constructor(
     private val navHeaderMapper: NavHeaderUiModelMapper,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val saveLanguageInteractor: SaveCurrentLanguageInteractor,
+    private var getLanguageInteractor: GetCurrentLanguageInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
     private val groupedPush: GroupedPush,
     serverInteractor: GetCurrentServerInteractor,
@@ -263,4 +265,11 @@ class MainPresenter @Inject constructor(
         baseContext.resources.updateConfiguration(config, baseContext.resources.displayMetrics)
         saveLanguageInteractor.save(lang)
     }
+
+     fun loadLocale(baseContext: Context) {
+        val currentLanguage = getLanguageInteractor.get()
+        if (currentLanguage != null) {
+            setLocale(currentLanguage, baseContext)
+        }
+    }
 }

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -56,8 +56,6 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     lateinit var presenter: MainPresenter
     @Inject
     lateinit var permissions: PermissionsInteractor
-    @Inject
-    lateinit var getLanguageInteractor: GetCurrentLanguageInteractor
     private var isFragmentAdded: Boolean = false
     private var expanded = false
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
@@ -77,9 +75,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         presenter.loadServerAccounts()
         presenter.loadCurrentInfo()
         presenter.loadEmojis()
+        presenter.loadLocale(baseContext)
         setupToolbar()
         setupNavigationView()
-        loadLocale()
     }
 
     override fun onSaveInstanceState(outState: Bundle?) {
@@ -284,11 +282,4 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         progressDialog?.dismiss()
         progressDialog = null
     }
-
-    private fun loadLocale() {
-        val currentLanguage = getLanguageInteractor.get()
-        if (currentLanguage != null) {
-            presenter.setLocale(currentLanguage, baseContext)
-        }
-    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -146,7 +146,6 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
 
     fun changeLanguage() {
         val languages = resources.getStringArray(R.array.languages)
-        val mainActivity =(activity as? MainActivity)
 
         context?.let {
             AlertDialog.Builder(it)
@@ -154,67 +153,59 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                 .setSingleChoiceItems(languages, -1) { dialog, which ->
                     when (which) {
                         0 -> {
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("en", it1) }
+                            presenter.setLocale("en", activity!!.baseContext)
                             activity?.recreate()
                         }
                         1 -> {
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("hi", it1) }
+                            presenter.setLocale("hi", activity!!.baseContext)
                             activity?.recreate()
                         }
                         2 -> {
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("ja", it1) }
+                            presenter.setLocale("ja", activity!!.baseContext)
                             activity?.recreate()
                         }
                         3 -> {
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("ru", it1) }
+                            presenter.setLocale("ru", activity!!.baseContext)
                             activity?.recreate()
                         }
                         4 -> {
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("it", it1) }
+                            presenter.setLocale("it", activity!!.baseContext)
                             activity?.recreate()
                         }
                         5->{
-                            activity?.baseContext?.let { it1 ->
-                                presenter.setLocaleWithRegion("pt","BR",
-                                    it1
-                                )
-                            }
+                            presenter.setLocaleWithRegion("pt", "BR", activity!!.baseContext)
                             activity?.recreate()
                         }
                         6->{
-                            activity?.baseContext?.let { it1 ->
-                                presenter.setLocaleWithRegion("pt","PT",
-                                    it1
-                                )
-                            }
+                            presenter.setLocaleWithRegion("pt", "PT", activity!!.baseContext)
                             activity?.recreate()
                         }
                         7->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("zh", it1) }
+                            presenter.setLocale("zh", activity!!.baseContext)
                             activity?.recreate()
                         }
                         8->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("de", it1) }
+                            presenter.setLocale("de", activity!!.baseContext)
                             activity?.recreate()
                         }
                         9->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("es", it1) }
+                            presenter.setLocale("es", activity!!.baseContext)
                             activity?.recreate()
                         }
                         10->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("fa", it1) }
+                            presenter.setLocale("fa", activity!!.baseContext)
                             activity?.recreate()
                         }
                         11->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("fr", it1) }
+                            presenter.setLocale("fr", activity!!.baseContext)
                             activity?.recreate()
                         }
                         12->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("tr", it1) }
+                            presenter.setLocale("tr", activity!!.baseContext)
                             activity?.recreate()
                         }
                         13->{
-                            activity?.baseContext?.let { it1 -> presenter.setLocale("uk", it1) }
+                            presenter.setLocale("uk", activity!!.baseContext)
                             activity?.recreate()
                         }
                     }