ISSUE-592: switch to the main thread to change language on 33+ (Kaspe…

…rskyLab#596)
ZadorozhnyiSemen · Nov 14, 2023 · e07ac1a · e07ac1a
1 parent 971b8d9
commit e07ac1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/languages/LanguageImpl.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/languages/LanguageImpl.kt
@@ -1,8 +1,10 @@
 package com.kaspersky.kaspresso.device.languages
 
+import android.app.Instrumentation
 import android.app.LocaleManager
 import android.content.Context
 import android.os.Build
+import android.os.Handler
 import android.os.LocaleList
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.ConfigurationCompat
@@ -15,7 +17,7 @@ import java.util.Locale
  */
 class LanguageImpl(
     private val logger: UiTestLogger,
-    private val context: Context
+    private val instrumentation: Instrumentation,
 ) : Language {
 
     override fun switchInApp(locale: Locale) {
@@ -44,14 +46,16 @@ class LanguageImpl(
     }
 
     private fun getCurrentLocale(): Locale? =
-        ConfigurationCompat.getLocales(context.resources.configuration).get(0)
+        ConfigurationCompat.getLocales(instrumentation.targetContext.resources.configuration).get(0)
 
     private fun applyCurrentLocaleToContext(locale: Locale) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val localeManager = context.getSystemService(Context.LOCALE_SERVICE) as LocaleManager
+            val localeManager = instrumentation.targetContext.getSystemService(Context.LOCALE_SERVICE) as LocaleManager
             localeManager.applicationLocales = LocaleList.forLanguageTags(locale.toLanguageTag())
         } else {
-            AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(locale))
+            Handler(instrumentation.targetContext.mainLooper).post {
+                AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(locale))
+            }
         }
     }
 }
diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/kaspresso/Kaspresso.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/kaspresso/Kaspresso.kt
@@ -742,7 +742,7 @@ data class Kaspresso(
                 instrumentalDependencyProviderFactory.getComponentProvider<ExploitImpl>(instrumentation),
                 adbServer
             )
-            if (!::language.isInitialized) language = LanguageImpl(libLogger, instrumentation.targetContext)
+            if (!::language.isInitialized) language = LanguageImpl(libLogger, instrumentation)
             if (!::logcat.isInitialized) logcat = LogcatImpl(libLogger, adbServer)
 
             if (!::flakySafetyParams.isInitialized) flakySafetyParams = FlakySafetyParams.default()