From a7192e866fb8758297f045332029c4c1ac023e05 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Tue, 27 Dec 2016 20:18:38 +0100
Subject: [PATCH] Locale fix. Kotlin update to 1.0.6

---
 app/build.gradle                                |  2 +-
 .../eu/kanade/tachiyomi/util/LocaleHelper.kt    | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0bdf1b6f33..dd93f3e49d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -204,7 +204,7 @@ dependencies {
 }
 
 buildscript {
-    ext.kotlin_version = '1.0.5-2'
+    ext.kotlin_version = '1.0.6'
     repositories {
         mavenCentral()
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt
index 1e8568b4de..b3dd5fb418 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt
@@ -30,6 +30,12 @@ object LocaleHelper {
      */
     private var appLocale = getLocaleFromString(preferences.lang())
 
+    /**
+     * The currently applied locale. Used to avoid losing the selected language after a non locale
+     * configuration change to the application.
+     */
+    private var currentLocale: Locale? = null
+
     /**
      * Returns the locale for the value stored in preferences, or null if it's system language.
      *
@@ -72,15 +78,16 @@ object LocaleHelper {
         if (systemLocale == null) {
             systemLocale = getConfigLocale(config)
         }
-        // In API 16 and lower the system locale can't be changed.
+        // In API 16 and lower [systemLocale] can't be changed.
         if (configChange && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val newLocale = getConfigLocale(config)
-            if (systemLocale == newLocale) {
+            val configLocale = getConfigLocale(config)
+            if (currentLocale == configLocale) {
                 return
             }
-            systemLocale = newLocale
+            systemLocale = configLocale
         }
-        val newConfig = updateConfigLocale(config, appLocale ?: systemLocale ?: Locale.getDefault())
+        currentLocale = appLocale ?: systemLocale ?: Locale.getDefault()
+        val newConfig = updateConfigLocale(config, currentLocale!!)
         val resources = app.resources
         resources.updateConfiguration(newConfig, resources.displayMetrics)
     }