From 84e0601b76af958b95e0ee7cc130591256533453 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Mon, 6 Feb 2023 02:51:32 +0300
Subject: [PATCH] refactoring

---
 .../lite/ui/components/IconManager.java         | 17 ++++-------------
 .../lite/ui/fragments/IconsFragment.java        |  6 +++---
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java
index 42ea38784..47cfbbc57 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java
@@ -46,27 +46,18 @@ public class IconManager {
         return Preferences.hasVerification() && Preferences.isValidSignature() ? sIconsPlus : sIcons; // delete later sdk check
     }
 
-    public static void switchComponent(String icon, String appName, String oldIcon, String oldAppName) {
+    public static void switchComponent(String icon, String appName) {
 
         // def value for standard icon
         var iconIndex = 1;
         // def value for standard label
         var labelIndex = 1;
 
-        var oldIconIndex = -1;
-
-        var oldLabelIndex = -1;
-
         Log.d("IconManager", "iconSwitcher: icon = " + icon + ", appname = " + appName);
 
         List<String> iconsList = (Preferences.hasVerification() && Preferences.isValidSignature()) ? sIconsPlus : sIcons;
         List<String> labelsList = sLabels;
 
-        if (oldIcon != null && oldAppName != null) {
-            oldIconIndex = iconsList.indexOf(oldIcon);
-            oldLabelIndex = labelsList.indexOf(oldAppName);
-        }
-
         // check if icon is exist
         if (iconsList.contains(icon))
             // get icon index
@@ -81,14 +72,14 @@ public class IconManager {
 
         main: for (int i = 0; i < iconsList.size(); i++) {
             for (int o = 0; o < labelsList.size(); o++) {
-                if (isComponentEnabled("id" + i + "" + o)) {
-                    currentState = i + "" + o;
+                if (isComponentEnabled("id" + i + o)) {
+                    currentState = i + String.valueOf(o);
                     break main;
                 }
             }
         }
 
-        String newState = iconIndex + "" + labelIndex;
+        String newState = iconIndex + String.valueOf(labelIndex);
 
         // check if current component is equal to custom value or if custom value is not exist
         if (currentState.equals(newState))
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java
index 57697865f..c08b78921 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java
@@ -63,17 +63,17 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                         AndroidUtils.edit().putString("appname", "vt").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "vt", deficon, defname);
+                        IconManager.switchComponent(appicon, "vt");
                     } else if (rgVK.isChecked()) {
                         AndroidUtils.edit().putString("appname", "standard").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "standard", deficon, defname);
+                        IconManager.switchComponent(appicon, "standard");
                     } else if (rgVKontakte.isChecked()) {
                         AndroidUtils.edit().putString("appname", "vkontakte").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "vkontakte", deficon, defname);
+                        IconManager.switchComponent(appicon, "vkontakte");
                     }
                 }))
                 .setNegativeButton(R.string.cancel,