From eba8c9e642f0d5091b7a1e19dae9ab6e2da2a439 Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Thu, 21 Sep 2017 11:02:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dinect/checker/MainActivity.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/dinect/checker/MainActivity.java b/android/app/src/main/java/com/dinect/checker/MainActivity.java index 4a79f26..b6f042d 100644 --- a/android/app/src/main/java/com/dinect/checker/MainActivity.java +++ b/android/app/src/main/java/com/dinect/checker/MainActivity.java @@ -15,6 +15,8 @@ import com.dinect.checker.zbar.CameraActivity; import com.dinect.checker.zxing.ScannerActivity; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -66,7 +68,7 @@ public class MainActivity extends FlutterActivity { private void callMethod(MethodCall call, Result result) { switch (call.method) { case "getLocale": - result.success(Locale.getDefault().getLanguage()); + result.success(getLanguage()); break; case "getFlavor": result.success(BuildConfig.flavor); @@ -93,6 +95,15 @@ public class MainActivity extends FlutterActivity { } } + private String getLanguage() { + List availableLanguages = Arrays.asList("ru", "en"); + if (availableLanguages.contains(Locale.getDefault().getLanguage())) { + return Locale.getDefault().getLanguage(); + } else { + return BuildConfig.locale; + } + } + private void checkInternetConnection(Result result) { boolean connected = Utils.isOnline(this); if (!connected)