[refactor] Set Java version to 1.8 and cleanup code

Signed-off-by: Iscle <albertiscle9@gmail.com>
AOF-Dev · Nov 2, 2020 · f42493a · f42493a
1 parent 0256135
commit f42493a
Show file tree

Hide file tree

Showing 31 changed files with 157 additions and 281 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/achieve/CkbManagerDialog.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/achieve/CkbManagerDialog.java
@@ -91,7 +91,7 @@ private void initUI() {
 
         //是否显示模式选项
         if(mManager.getController() == null){
-            ((LinearLayout)findViewById(R.id.input_customize_keyboard_dialog_layout_mode)).setVisibility(View.GONE);
+            findViewById(R.id.input_customize_keyboard_dialog_layout_mode).setVisibility(View.GONE);
         }
 
     }
@@ -246,12 +246,7 @@ public void updataUI() {
     }
 
     public void setButtonCounts(final int counts){
-        this.textButtonSum.post(new Runnable() {
-            @Override
-            public void run() {
-                textButtonSum.setText(String.valueOf(counts));
-            }
-        });
+        this.textButtonSum.post(() -> textButtonSum.setText(String.valueOf(counts)));
     }
 
     private Timer mTimer;

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/achieve/GameButtonDialog.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/achieve/GameButtonDialog.java
@@ -164,7 +164,7 @@ private void initUI() {
         seekbarAlpha.setMax(GameButton.MAX_ALPHA_SIZE_PT);
         seekbarCornerSize.setMax(GameButton.MAX_CORNOR_SIZE_PT);
         seekbarTextSize.setMax(GameButton.MAX_TEXT_SIZE_SP);
-        spinnerDesign.setAdapter(new ArrayAdapter<String>(mContext, android.R.layout.simple_spinner_item, Arrays.asList(CkbThemeMarker.DESIGNS)));
+        spinnerDesign.setAdapter(new ArrayAdapter<>(mContext, android.R.layout.simple_spinner_item, Arrays.asList(CkbThemeMarker.DESIGNS)));
 
 
         //设定监听
@@ -347,7 +347,7 @@ public void runWhenPositive() {
 
         if (v == textMap1 || v == textMap2 || v == textMap3 || v == textMap4) {
             int i = 0;
-            String n = "";
+            String n;
             if (v == textMap1) {
                 n = textMap1.getText().toString();
             } else if (v == textMap2) {

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/button/GameButton.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/button/GameButton.java
@@ -284,7 +284,7 @@ public boolean setAlphaSize(int alphaPt){
     public boolean setKeyName(String str){
         if(str != null){
             this.setText(str);
-            this.keyName = new String(str);
+            this.keyName = str;
             return true;
         }else{
             return false;

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/support/GameButtonRecorder.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/ckb/support/GameButtonRecorder.java
@@ -29,14 +29,14 @@ public void recordData(GameButton gb){
         System.arraycopy(gb.getKeyTypes(),0,this.keyTypes,0,GameButton.MAX_KEYMAP_SIZE);
         this.designIndex = gb.getDesignIndex();
         this.cornerRadius = gb.getCornerRadius();
-        this.textColor = new String(gb.getTextColorHex());
+        this.textColor = gb.getTextColorHex();
         System.arraycopy(gb.getColorHexs(),0,this.themeColors,0,CkbThemeRecorder.COLOR_INDEX_LENGTH);
         this.isKeep = gb.isKeep();
         this.isHide = gb.isHide();
         System.arraycopy(gb.getKeyPos(),0,this.keyPos,0, 2);
         System.arraycopy(gb.getKeySize(),0,this.keySize,0, 2);
         this.alphaSize = gb.getAlphaSize();
-        this.keyName = new String(gb.getKeyName());
+        this.keyName = gb.getKeyName();
         this.isViewerFollow = gb.isViewerFollow();
         this.show = gb.getShow();
         this.textSize = gb.getTextProgress();

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/GlfwKeyMap.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/GlfwKeyMap.java
@@ -11,7 +11,7 @@ public class GlfwKeyMap implements KeyMap {
     private HashMap<String,Integer> glfwKeyMap;
 
     public GlfwKeyMap(){
-        glfwKeyMap = new HashMap<String, Integer>();
+        glfwKeyMap = new HashMap<>();
         init();
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/LwjglKeyMap.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/LwjglKeyMap.java
@@ -11,7 +11,7 @@ public class LwjglKeyMap implements KeyMap {
     private HashMap<String,Integer> lwjglMap;
 
     public LwjglKeyMap(){
-        lwjglMap = new HashMap<String, Integer>();
+        lwjglMap = new HashMap<>();
         init();
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/XKeyMap.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/codes/XKeyMap.java
@@ -18,7 +18,7 @@ public class XKeyMap implements KeyMap , AppEvent , MouseMap {
     private HashMap<String,Integer> xKeyMap;
 
     public XKeyMap(){
-        xKeyMap = new HashMap<String, Integer>();
+        xKeyMap = new HashMap<>();
         init();
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/controller/VirtualController.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/controller/VirtualController.java
@@ -330,11 +330,7 @@ public void runWhenPositive(){
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
         if(buttonView instanceof SwitchCompat && bindingViews.containsKey(buttonView)){
-            if(isChecked){
-                (Objects.requireNonNull(bindingViews.get(buttonView))).setEnable(true);
-            }else{
-                (Objects.requireNonNull(bindingViews.get(buttonView))).setEnable(false);
-            }
+            (Objects.requireNonNull(bindingViews.get(buttonView))).setEnable(isChecked);
         }
         if(buttonView == checkboxLock){
             if(isChecked){

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/input/screen/CrossKeyboard.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/input/screen/CrossKeyboard.java
@@ -206,7 +206,7 @@ private void applyCrossKey(View v, MotionEvent e) {
          *  |7|8|9|
          * --------
          */
-        int location = 0; //九宫格位置标志 失去焦点时为 0
+        int location; //九宫格位置标志 失去焦点时为 0
         //自左向右，第一列
         if (shiftPos[0] < buttonWidth && shiftPos[0] >= 0) {
 
@@ -339,7 +339,7 @@ private void uiUpdate(int location, MotionEvent e) {
 
     private void makeKeyEvent(int location, MotionEvent e) {
 
-        String keyName = "";
+        String keyName;
 
         switch (location) {
             case 1:
@@ -466,7 +466,6 @@ public void setSize(int s) {
         p.width = s / 2;
         p.height = s / 2;
         crossKeyBoardExtend.requestLayout();
-        ;
         crossKeyBoardExtend.invalidate();
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/gamecontroller/input/screen/OnscreenMouse.java b/app/src/main/java/com/aof/mcinabox/gamecontroller/input/screen/OnscreenMouse.java
@@ -559,7 +559,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
             int p = progress + MIN_SHEEL_SPEED_PROGRESS;
             textWheelSpeed.setText(String.valueOf(p));
             //设置滚轮速度
-            ((OnscreenMouse) mInput).setWheelSpeed((int) (OnscreenMouse.DEFAULT_WHEEL_SPEED / p));
+            ((OnscreenMouse) mInput).setWheelSpeed(OnscreenMouse.DEFAULT_WHEEL_SPEED / p);
         }
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/lang/LangManager.java b/app/src/main/java/com/aof/mcinabox/launcher/lang/LangManager.java
@@ -40,8 +40,9 @@ public boolean fitSystemLang(){
     public void switchLang(@NonNull String tag){
         boolean included = false;
         for(String str : LanguageUtils.LANG_TAGS){
-            if(str.equals(tag)){
+            if (str.equals(tag)) {
                 included = true;
+                break;
             }
         }
         if(!included){

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/lang/LanguageDialog.java b/app/src/main/java/com/aof/mcinabox/launcher/lang/LanguageDialog.java
@@ -2,8 +2,6 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
@@ -29,13 +27,10 @@ public LanguageDialog(Context context){
 
     private void initUI(){
         listLanguages = findViewById(R.id.dialog_listview_languages);
-        listLanguages.setAdapter(new ArrayAdapter<String>(mContext, android.R.layout.simple_list_item_1, Arrays.asList(LanguageUtils.LANG_TAGS)));
-        listLanguages.setOnItemClickListener(new ListView.OnItemClickListener(){
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
-                ChangeLauncherLanguage(listLanguages.getAdapter().getItem(pos).toString());
-                dismiss();
-            }
+        listLanguages.setAdapter(new ArrayAdapter<>(mContext, android.R.layout.simple_list_item_1, Arrays.asList(LanguageUtils.LANG_TAGS)));
+        listLanguages.setOnItemClickListener((adapterView, view, pos, l) -> {
+            ChangeLauncherLanguage(listLanguages.getAdapter().getItem(pos).toString());
+            dismiss();
         });
     }
 

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/launch/support/BoatArgsMaker.java b/app/src/main/java/com/aof/mcinabox/launcher/launch/support/BoatArgsMaker.java
@@ -297,8 +297,8 @@ private String getAuthlibInjectorArgs() {
         SettingJson.Account account = UserManager.getSelectedAccount(mSetting);
 
         if(account.getType().equals(SettingJson.USER_TYPE_EXTERNAL)) {
-            args.append("-javaagent:" + AppManifest.AUTHLIB_INJETOR_JAR + "=" + account.getApiUrl());
-            args.append(" -Dauthlibinjector.yggdrasil.prefetched=" + account.getApiMeta());
+            args.append("-javaagent:").append(AppManifest.AUTHLIB_INJETOR_JAR).append("=").append(account.getApiUrl());
+            args.append(" -Dauthlibinjector.yggdrasil.prefetched=").append(account.getApiMeta());
             return args.toString();
         }
         return null;

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/setting/support/SettingChecker.java b/app/src/main/java/com/aof/mcinabox/launcher/setting/support/SettingChecker.java
@@ -8,7 +8,6 @@
 import com.aof.mcinabox.launcher.download.authlib.Request;
 import com.aof.mcinabox.launcher.runtime.RuntimeManager;
 import com.aof.mcinabox.launcher.tipper.TipperManager;
-import com.aof.mcinabox.launcher.tipper.support.TipperRunable;
 import com.aof.mcinabox.launcher.user.UserManager;
 import com.aof.mcinabox.utils.FileTool;
 import com.aof.mcinabox.utils.MemoryUtils;
@@ -47,72 +46,42 @@ public SettingChecker(Context context, SettingJson setting, TipperManager manage
 
     public void checkIfChoseUser(){
         if(UserManager.getSelectedAccount(mSetting) == null){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_selected_user), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_create_user_please_do_it),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_NOT_CHOOSE_USER));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_selected_user), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_create_user_please_do_it),mContext.getString(R.string.title_ok),null),CHECKER_ID_NOT_CHOOSE_USER));
         }else{
             mTipperManager.removeTip(CHECKER_ID_NOT_CHOOSE_USER);
         }
     }
     public void checkIfInstallRuntime(){
         if(RuntimeManager.getPackInfo() == null){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_install_runtime), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_install_runtime_please_do_it),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_NOT_INSTALL_RUNTIME));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_install_runtime), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_install_runtime_please_do_it),mContext.getString(R.string.title_ok),null),CHECKER_ID_NOT_INSTALL_RUNTIME));
         }else{
             mTipperManager.removeTip(CHECKER_ID_NOT_INSTALL_RUNTIME);
         }
     }
     public void checkIfInstallGame(){
         if(FileTool.listChildDirFromTargetDir(AppManifest.MINECRAFT_VERSIONS).size() == 0){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_select_version), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_selected_version_please_do_it),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_NOT_INSTALL_GAME));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_WARN, mContext.getString(R.string.tips_not_select_version), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_warn),mContext.getString(R.string.tips_not_selected_version_please_do_it),mContext.getString(R.string.title_ok),null),CHECKER_ID_NOT_INSTALL_GAME));
         }else{
             mTipperManager.removeTip(CHECKER_ID_NOT_INSTALL_GAME);
         }
     }
     public void checkMenmrySize(){
         if(mSetting.getConfigurations().getMaxMemory() < 256){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.tips_available_memory_low), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_set_more_memory),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_MEMORY_LOW));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.tips_available_memory_low), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_set_more_memory),mContext.getString(R.string.title_ok),null),CHECKER_ID_MEMORY_LOW));
         }else{
             mTipperManager.removeTip(CHECKER_ID_MEMORY_LOW);
         }
 
         if(mSetting.getConfigurations().getMaxMemory() > MemoryUtils.getDynamicHeapSize(mContext) * 2 - 20 || mSetting.getConfigurations().getMaxMemory() > MemoryUtils.getTotalMemoryMB(mContext)){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.tips_available_memory_over), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_set_less_memory),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_MEMORY_OVER));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.tips_available_memory_over), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_set_less_memory),mContext.getString(R.string.title_ok),null),CHECKER_ID_MEMORY_OVER));
         }else{
             mTipperManager.removeTip(CHECKER_ID_MEMORY_OVER);
         }
     }
 
     public void checkIfDisableFileCheck(){
         if(mSetting.getConfigurations().isNotCheckGame()){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.title_not_check_minecraft), new TipperRunable() {
-                @Override
-                public void run() {
-                    DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_turn_on_minecraft_check),mContext.getString(R.string.title_ok),null);
-                }
-            },CHECKER_ID_NOT_CHECK_GAME));
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_NOTE, mContext.getString(R.string.title_not_check_minecraft), () -> DialogUtils.createSingleChoiceDialog(mContext,mContext.getString(R.string.title_note),mContext.getString(R.string.tips_please_turn_on_minecraft_check),mContext.getString(R.string.title_ok),null),CHECKER_ID_NOT_CHECK_GAME));
         }else{
             mTipperManager.removeTip(CHECKER_ID_NOT_CHECK_GAME);
         }
@@ -122,17 +91,12 @@ public void checkAuthlibInjector(){
         SettingJson.Account account = UserManager.getSelectedAccount(mSetting);
         File file = new File(AppManifest.AUTHLIB_INJETOR_JAR);
         if(!file.exists() && account != null && account.type.equals(SettingJson.USER_TYPE_EXTERNAL)){
-            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_ERROR, mContext.getString(R.string.title_missing_authlib), new TipperRunable() {
+            mTipperManager.addTip(TipperManager.createTipBean(mContext, TipperManager.TIPPER_LEVEL_ERROR, mContext.getString(R.string.title_missing_authlib), () -> DialogUtils.createBothChoicesDialog(mContext,mContext.getString(R.string.title_error),mContext.getString(R.string.tips_please_download_authlib_injector),mContext.getString(R.string.title_ok),mContext.getString(R.string.title_cancel),new DialogSupports(){
                 @Override
-                public void run() {
-                    DialogUtils.createBothChoicesDialog(mContext,mContext.getString(R.string.title_error),mContext.getString(R.string.tips_please_download_authlib_injector),mContext.getString(R.string.title_ok),mContext.getString(R.string.title_cancel),new DialogSupports(){
-                        @Override
-                        public void runWhenPositive(){
-                            new Request(mContext).requestLastestVersion();
-                        }
-                    });
+                public void runWhenPositive(){
+                    new Request(mContext).requestLastestVersion();
                 }
-            },CHECKER_ID_MISSING_AUTHLIB));
+            }),CHECKER_ID_MISSING_AUTHLIB));
         }else{
             mTipperManager.removeTip(CHECKER_ID_MISSING_AUTHLIB);
         }

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/tipper/support/TipperListAdapter.java b/app/src/main/java/com/aof/mcinabox/launcher/tipper/support/TipperListAdapter.java
@@ -73,13 +73,11 @@ public View getView(final int position, View convertView, ViewGroup parent) {
 
         viewHolder.context = tipperList.get(position).getContext();
         viewHolder.tip.setText(tipperList.get(position).getTipper_info());
-        viewHolder.help.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(tipperList.get(position).getTipper_runable() != null){
-                    tipperList.get(position).getTipper_runable().run();
-                }
-            }});
+        viewHolder.help.setOnClickListener(v -> {
+            if(tipperList.get(position).getTipper_runable() != null){
+                tipperList.get(position).getTipper_runable().run();
+            }
+        });
         return convertView;
 
     }

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/tipper/support/TipperRunable.java b/app/src/main/java/com/aof/mcinabox/launcher/tipper/support/TipperRunable.java
@@ -2,6 +2,6 @@
 
 public interface TipperRunable {
 
-    public void run();
+    void run();
 
 }
diff --git a/app/src/main/java/com/aof/mcinabox/launcher/uis/InstallVersionUI.java b/app/src/main/java/com/aof/mcinabox/launcher/uis/InstallVersionUI.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -58,12 +57,9 @@ public void onCreate() {
         buttonSnapshot = layout_installversion.findViewById(R.id.radiobutton_type_snapshot);
         buttonOld = layout_installversion.findViewById(R.id.radiobutton_type_old);
         listVersionsOnline = layout_installversion.findViewById(R.id.list_minecraft_manifest);
-        listVersionsOnline.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
-                selectedVersionPos = pos;
-                textSelectedVersion.setText(listVersionsOnline.getAdapter().getItem(pos).toString());
-            }
+        listVersionsOnline.setOnItemClickListener((adapterView, view, pos, l) -> {
+            selectedVersionPos = pos;
+            textSelectedVersion.setText(listVersionsOnline.getAdapter().getItem(pos).toString());
         });
 
         groupVersionType.setOnCheckedChangeListener(this);

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/uis/LauncherSettingUI.java b/app/src/main/java/com/aof/mcinabox/launcher/uis/LauncherSettingUI.java
@@ -128,7 +128,7 @@ public void onClick(View v) {
                 String[] files;
                 final String[] tmp2;
                 if(tmp.size() != 0){
-                    files = tmp.toArray(new String[tmp.size()]);
+                    files = tmp.toArray(new String[0]);
                     tmp2 = new String[Objects.requireNonNull(files).length + 1];
                     System.arraycopy(files,0,tmp2,1,files.length);
                 }else{

diff --git a/app/src/main/java/com/aof/mcinabox/launcher/user/UserManager.java b/app/src/main/java/com/aof/mcinabox/launcher/user/UserManager.java
@@ -148,11 +148,7 @@ public static void clearLegalData(Context context){
     public static void setAccountSelected(String username){
         SettingJson.Account a = getAccountByUsername(MainActivity.Setting,username);
         for(SettingJson.Account account : MainActivity.Setting.getAccounts()){
-            if(account == a){
-                account.setSelected(true);
-            }else{
-                account.setSelected(false);
-            }
+            account.setSelected(account == a);
         }
     }