From a9da06a832d8555db9ab8815be65c71585ccc6b5 Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Thu, 2 May 2024 20:20:55 +0800
Subject: [PATCH] update

---
 .../android/tv/ui/dialog/LanguageDialog.java  |  4 ++--
 .../java/com/fongmi/android/tv/Setting.java   | 16 ++------------
 .../fongmi/android/tv/utils/LanguageUtil.java | 21 ++++++++++++-------
 .../com/fongmi/android/tv/utils/Util.java     |  6 ++++++
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LanguageDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LanguageDialog.java
index 57c4c5c07..b270df545 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LanguageDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LanguageDialog.java
@@ -13,8 +13,8 @@ import com.fongmi.android.tv.databinding.DialogMenuBinding;
 import com.fongmi.android.tv.ui.activity.SettingCustomActivity;
 import com.fongmi.android.tv.ui.adapter.MenuAdapter;
 import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
-import com.fongmi.android.tv.utils.LanguageUtil;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.Util;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
@@ -82,6 +82,6 @@ public class LanguageDialog implements MenuAdapter.OnClickListener {
         if (dialog != null) dialog.dismiss();
         Setting.putLanguage(position);
         ((SettingCustomActivity) activity).setLanguageText();
-        LanguageUtil.restartApp(activity);
+        Util.restartApp(activity);
     }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java
index 2d3e6f9cc..def02a36e 100644
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.provider.Settings;
 
 import com.fongmi.android.tv.player.Players;
+import com.fongmi.android.tv.utils.LanguageUtil;
 import com.github.catvod.utils.Prefers;
 
 import java.util.Locale;
@@ -483,21 +484,8 @@ public class Setting {
         Prefers.put("language", key);
     }
 
-    private static int getLocalLanguage() {
-        if (Locale.getDefault().getLanguage().equals("zh")) {
-            if (Locale.getDefault().getCountry().equals("TW")) {
-                return 2;
-            } else {
-                return 1;
-            }
-        } else {
-            return 0;
-        }
-    }
-
     public static int getLanguage() {
-        int defaultValue = getLocalLanguage();
-        return Prefers.getInt("language", defaultValue);
+        return Prefers.getInt("language", LanguageUtil.locale());
     }
 
     public static void putParseWebView(int key) {
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/LanguageUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/LanguageUtil.java
index 0d1f23a40..7a7b84256 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/LanguageUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/LanguageUtil.java
@@ -8,20 +8,27 @@ import java.util.Locale;
 
 public class LanguageUtil {
     public static void setLanguage(Resources resources, int lang) {
-        resources.getConfiguration().locale = getLocaleByLanguage(lang);
+        resources.getConfiguration().locale = getLocale(lang);
         resources.updateConfiguration(resources.getConfiguration(), resources.getDisplayMetrics());
     }
 
-    private static Locale getLocaleByLanguage(int lang) {
+    public static int locale() {
+        if (Locale.getDefault().getLanguage().equals("zh")) {
+            if (Locale.getDefault().getCountry().equals("TW")) {
+                return 2;
+            } else {
+                return 1;
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    private static Locale getLocale(int lang) {
         if (lang == 0) return Locale.ENGLISH;
         else if (lang == 1) return Locale.CHINESE;
         else if (lang == 2) return Locale.TRADITIONAL_CHINESE;
         else return Locale.ENGLISH;
     }
 
-    public static void restartApp(Activity activity) {
-        Intent intent = activity.getBaseContext().getPackageManager().getLaunchIntentForPackage(activity.getBaseContext().getPackageName());
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        activity.startActivity(intent);
-    }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java
index bb6f81973..cc1073982 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java
@@ -186,4 +186,10 @@ public class Util {
         return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
     }
 
+    public static void restartApp(Activity activity) {
+        Intent intent = activity.getBaseContext().getPackageManager().getLaunchIntentForPackage(activity.getBaseContext().getPackageName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        activity.startActivity(intent);
+    }
+
 }