From 0171261465df8a1c8984dce44866d46fdf9da172 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 30 Nov 2017 21:01:23 -0800 Subject: [PATCH] Fix a crash on Android 4.4 --- .../scala/com/github/shadowsocks/ShadowsocksApplication.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala b/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala index e9d77c04..c134d138 100644 --- a/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala +++ b/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala @@ -93,8 +93,8 @@ class ShadowsocksApplication extends Application { } private def checkChineseLocale(locale: Locale): Locale = if (locale.getLanguage == "zh") locale.getCountry match { - case "CN" | "TW" => null // already supported - case _ => locale.getScript match { // fallback to the corresponding script + case "CN" | "TW" => null + case _ => (if (Build.VERSION.SDK_INT >= 21) locale.getScript else null) match { case "Hans" => SIMPLIFIED_CHINESE case "Hant" => TRADITIONAL_CHINESE case script =>