Commit 7474269f authored by Mygod's avatar Mygod

Fix crash on 4.4

parent 40447ce1
...@@ -43,6 +43,7 @@ import java.util ...@@ -43,6 +43,7 @@ import java.util
import java.util.Locale import java.util.Locale
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import android.annotation.SuppressLint
import android.app.Application import android.app.Application
import android.content.res.Configuration import android.content.res.Configuration
import android.os.{Build, LocaleList} import android.os.{Build, LocaleList}
...@@ -62,8 +63,10 @@ object ShadowsocksApplication { ...@@ -62,8 +63,10 @@ object ShadowsocksApplication {
private final val TAG = "ShadowsocksApplication" private final val TAG = "ShadowsocksApplication"
// The ones in Locale doesn't have script included // The ones in Locale doesn't have script included
private final lazy val SIMPLIFIED_CHINESE = Locale.forLanguageTag("zh-Hans-CN") private final lazy val SIMPLIFIED_CHINESE =
private final lazy val TRADITIONAL_CHINESE = Locale.forLanguageTag("zh-Hant-TW") if (Build.VERSION.SDK_INT >= 21) Locale.forLanguageTag("zh-Hans-CN") else Locale.SIMPLIFIED_CHINESE
private final lazy val TRADITIONAL_CHINESE =
if (Build.VERSION.SDK_INT >= 21) Locale.forLanguageTag("zh-Hant-TW") else Locale.TRADITIONAL_CHINESE
} }
class ShadowsocksApplication extends Application { class ShadowsocksApplication extends Application {
...@@ -115,6 +118,7 @@ class ShadowsocksApplication extends Application { ...@@ -115,6 +118,7 @@ class ShadowsocksApplication extends Application {
} }
} else null } else null
@SuppressLint(Array("NewApi"))
private def checkChineseLocale(config: Configuration): Unit = if (Build.VERSION.SDK_INT >= 24) { private def checkChineseLocale(config: Configuration): Unit = if (Build.VERSION.SDK_INT >= 24) {
val localeList = config.getLocales val localeList = config.getLocales
val newList = new Array[Locale](localeList.size()) val newList = new Array[Locale](localeList.size())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment