Merge branch 'master' into av/multiplatform-merge-master

apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt

@@ -23,10 +23,10 @@ import java.lang.ref.WeakReference
 class MainActivity: FragmentActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
     super.onCreate(savedInstanceState)
     // testJson()
     mainActivity = WeakReference(this)
-    applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
     // When call ended and orientation changes, it re-process old intent, it's unneeded.
     // Only needed to be processed on first creation of activity
     if (savedInstanceState == null) {

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Locale.kt

@@ -22,8 +22,7 @@ fun Activity.saveAppLocale(pref: SharedPreference<String?>, languageCode: String
 
 fun Activity.applyAppLocale(pref: SharedPreference<String?>) {
   //  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-  val lang = pref.get()
-  if (lang == null || lang == Locale.getDefault().language) return
+  val lang = pref.get() ?: return
   applyLocale(Locale.forLanguageTag(lang))
   //  }
 }