Minor fixes

app/build.gradle.kts

@@ -63,7 +63,7 @@ android {
 
     signingConfig = signingConfigs.findByName("default")
 
-    resConfigs("en", "de", "fr-rCA", "lt", "pt")
+    //resConfigs("en", "de", "fr-rCA", "lt", "pt")
 
     vectorDrawables.useSupportLibrary = true
 

app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt

@@ -588,7 +588,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     outState?.putInt("OPEN_BUFFER", viewModel.buffer.value ?: -1)
     outState?.putInt("OPEN_BUFFERVIEWCONFIG", viewModel.bufferViewConfigId.value ?: -1)
     outState?.putLong("CONNECTED_ACCOUNT", connectedAccount)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       outPersistentState?.putInt("OPEN_BUFFER", viewModel.buffer.value ?: -1)
       outPersistentState?.putInt("OPEN_BUFFERVIEWCONFIG", viewModel.bufferViewConfigId.value ?: -1)
       outPersistentState?.putLong("CONNECTED_ACCOUNT", connectedAccount)
@@ -607,7 +607,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
   override fun onRestoreInstanceState(savedInstanceState: Bundle?,
                                       persistentState: PersistableBundle?) {
     super.onRestoreInstanceState(savedInstanceState, persistentState)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       val fallbackBuffer = persistentState?.getInt("OPEN_BUFFER", -1) ?: -1
       viewModel.buffer.onNext(
         savedInstanceState?.getInt("OPEN_BUFFER", fallbackBuffer)

app/src/main/java/de/kuschku/quasseldroid/util/ui/LocaleHelper.kt

@@ -31,8 +31,17 @@ object LocaleHelper {
     return updateResources(context, Settings.appearance(context).language)
   }
 
+  fun parseLanguageCode(rawLanguage: String): Locale {
+    val split = rawLanguage.split("-", limit = 3)
+    return when (split.size) {
+      3    -> Locale(split[0], split[2], split[1])
+      2    -> Locale(split[0], split[1], "")
+      else -> Locale(split[0], "", "")
+    }
+  }
+
   private fun updateResources(context: Context, language: String) = if (language.isNotEmpty()) {
-    val locale = Locale(language)
+    val locale = parseLanguageCode(language)
     Locale.setDefault(locale)
 
     val config = Configuration(context.resources.configuration)

app/src/main/res/values/strings_preferences.xml

@@ -107,11 +107,11 @@
     <item>en</item>
     <item>de</item>
     <!--<item>fr</item>-->
-    <item>fr_ca</item>
+    <item>fr-CA</item>
     <!--<item>nl</item>-->
     <item>lt</item>
     <item>pt</item>
-    <!--<item>pt_BR</item>-->
+    <!--<item>pt-BR</item>-->
     <!--<item>sr</item>-->
   </string-array>
 

app/src/test/java/de/kuschku/quasseldroid/util/ui/LocaleHelperTest.kt

+package de.kuschku.quasseldroid.util.ui
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class LocaleHelperTest {
+  @Test
+  fun testParseLanguageCode() {
+    LocaleHelper.parseLanguageCode("fr-CA").let {
+      assertEquals("CA", it.country)
+      assertEquals("", it.variant)
+      assertEquals("fr", it.language)
+    }
+    LocaleHelper.parseLanguageCode("zh-Hant-TW").let {
+      assertEquals("TW", it.country)
+      assertEquals("Hant", it.variant)
+      assertEquals("zh", it.language)
+    }
+    LocaleHelper.parseLanguageCode("zh").let {
+      assertEquals("", it.country)
+      assertEquals("", it.variant)
+      assertEquals("zh", it.language)
+    }
+  }
+}