修复修改语言重启Activity导致的ListMenu不能被init

Author: XiaoTong6666

app/build.gradle

@@ -209,6 +209,7 @@ android {
             minifyEnabled true
             shrinkResources false // Reproducible builds
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
 
         debug {

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -283,6 +283,16 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 	//  private float mTerminalToolbarDefaultHeight;
     private int mTerminalToolbarDefaultHeight;
     public boolean mInternalPassage;
+    private void initMenu() {
+        writerMainMenuConfig(true);
+        ZTUserBean ztUserBean = UserSetManage.Companion.get().getZTUserBean();
+        if (ztUserBean.isDisableMainConfigMenu()) {
+            MainMenuConfig.init(this);
+            initListMenu(MainMenuConfig.getMainMenuCategoryDatas());
+        } else {
+            initListMenu(XMLMainMenuConfig.getXmlMainMenuCategoryDatas(this));
+        }
+    }
 	// @}
 
 
@@ -359,7 +369,7 @@ public void onCreate(Bundle savedInstanceState) {
         // ZeroTermux add {@
         initZeroTermux();
         // @}
-
+        initMenu();
         setSettingsButtonView();
 
         setNewSessionButtonView();
@@ -1905,9 +1915,7 @@ private void initCommand() {
                 UUtils.chmod(zt);
             }
         }
-        //写入主菜单信息
-        writerMainMenuConfig(false);
-
+        initMenu();
         //写入icon
         File mainEditMenuIconPathFile = FileIOUtils.INSTANCE.getMainEditMenuIconPathFile();
         if (!mainEditMenuIconPathFile.exists()) {
@@ -1923,12 +1931,6 @@ private void initCommand() {
             intent.putExtra("edit_path", FileIOUtils.INSTANCE.getMainMenuXmlPathFile().getAbsolutePath());
             startActivity(intent);
         });
-        ZTUserBean ztUserBean = UserSetManage.Companion.get().getZTUserBean();
-        if (ztUserBean.isDisableMainConfigMenu()) {
-            initListMenu(MainMenuConfig.getMainMenuCategoryDatas());
-        } else {
-            initListMenu(XMLMainMenuConfig.getXmlMainMenuCategoryDatas(this));
-        }
     }
 
     private void writerMainMenuConfig(boolean cover) {

app/src/main/java/com/termux/zerocore/config/mainmenu/config/LanguageClickConfig.java

@@ -11,6 +11,7 @@
 import com.example.xh_lib.utils.UUtils;
 import com.mallotec.reb.localeplugin.utils.LocaleHelper;
 import com.termux.R;
+import com.termux.app.TermuxActivity;
 import com.termux.zerocore.popuwindow.MenuLeftPopuListWindow;
 
 import org.jetbrains.annotations.Nullable;
@@ -55,19 +56,23 @@ private void showMenuDialog(ArrayList<MenuLeftPopuListWindow.MenuLeftPopuListDat
 
     @Override
     public void itemClick(int id, int index, @Nullable MenuLeftPopuListWindow mMenuLeftPopuListWindow) {
-        switch (id) {
-            // 中文
-            case 30:
-                //  Intent intent = new Intent(this, TermuxActivity.class);
-                LocaleHelper.Companion.getInstance()
-                    .language(getLocale("2")).apply(mContext);
-                // startActivity(intent);
-                break;
-            // 英文
-            case 31:
-                LocaleHelper.Companion.getInstance()
-                    .language(getLocale("1")).apply(mContext);
-                break;
+        String langType = (id == 30) ? "2" : "1";
+
+        try {
+            java.io.File menuFile = com.termux.zerocore.utils.FileIOUtils.INSTANCE.getMainMenuXmlPathFile();
+            if (menuFile != null && menuFile.exists()) {
+                menuFile.delete();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        LocaleHelper.Companion.getInstance()
+            .language(getLocale(langType))
+            .apply(mContext);
+
+        if (mContext instanceof TermuxActivity) {
+            ((TermuxActivity) mContext).restartActivity();
         }
     }