refactor: removal of more blatant code smells

padraigfl · padraigfl · commit 20484e241da5 · 2024-09-08T03:04:37.000+01:00
diff --git a/src/model/AbstractDropmixDataRecord.java b/src/model/AbstractDropmixDataRecord.java
@@ -32,20 +32,10 @@ public String toString() {
     return (this.modified ? "[MODIFIED]" : "") + Helpers.byteArrayToString(Helpers.getNRange(raw, 4, dataLength));
   }
 
-  public boolean validateUpdatedData(byte[] newData) {
-    if (
-      newData.length != dataLength
-    ) {
-      return false;
-    }
-    return true;
-  }
-
   public static int getStartIndex(byte[] rawData, byte[] startSequence) {
     outer:
     for (int i = 0; i < rawData.length; i++) {
       if (rawData[i] == startSequence[0]) {
-        inner:
         for (int j = 1; j < startSequence.length &&  (j+i) < rawData.length; j++ ) {
           if (rawData[i + j] != startSequence[j]) {
             continue outer;
@@ -56,6 +46,4 @@ public static int getStartIndex(byte[] rawData, byte[] startSequence) {
     }
     return -1;
   }
-
-  public abstract String[] getHeadings();
 }
diff --git a/src/model/AppState.java b/src/model/AppState.java
@@ -5,17 +5,13 @@
 import util.Helpers;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
 
 public class AppState {
   public static AppState instance = new AppState();
   public File apkFile;
   public File dataZip;
-  public byte[] rawData;
-  public TreeMap<String, String> swapOptions = new TreeMap<String, String>();;
+  public TreeMap<String, String> swapOptions = new TreeMap<>();
   public TreeMap<String, String> playlistSwap = new TreeMap<>();
   public JadbDevice adbDevice;
   public DropmixSharedAssets assetsHandler;
@@ -48,7 +44,7 @@ public void setData(byte[] sharedAssets, byte[] level0) {
   }
 
   public DropmixSharedAssetsCard[] getCards() {
-    ArrayList<DropmixSharedAssetsCard> cards = new ArrayList<DropmixSharedAssetsCard>();
+    ArrayList<DropmixSharedAssetsCard> cards = new ArrayList<>();
     try {
       int seasonIdx = 0;
       DropmixSharedAssetsSeason season = this.assetsHandler.seasons.get(seasonIdx++);
@@ -63,7 +59,7 @@ public DropmixSharedAssetsCard[] getCards() {
     }
   }
   public DropmixSharedAssetsPlaylist[] getPlaylists() {
-    Set<String> playlistNames = new HashSet<String>();
+    Set<String> playlistNames = new HashSet<>();
     for (DropmixSharedAssetsCard c: AppState.getInstance().getCards()) {
       playlistNames.add(c.data.get(DropmixSharedAssetsCard.SeriesIcon));
     }
@@ -77,9 +73,8 @@ public DropmixSharedAssetsPlaylist[] getPlaylists() {
       seasons.add(playlist);
     }
     // this is required to sort the playlists in the common order
-    Collections.sort(seasons, new Comparator<DropmixSharedAssetsPlaylist>(){
-      public int compare(DropmixSharedAssetsPlaylist o1, DropmixSharedAssetsPlaylist o2)
-      {
+    seasons.sort(new Comparator<DropmixSharedAssetsPlaylist>() {
+      public int compare(DropmixSharedAssetsPlaylist o1, DropmixSharedAssetsPlaylist o2) {
         int val = o1.season.compareTo(o2.season);
         if (val == 0) {
           // baffler and promo are both empty
@@ -91,6 +86,9 @@ public int compare(DropmixSharedAssetsPlaylist o1, DropmixSharedAssetsPlaylist o
           }
           int card1 = Integer.parseInt(o1.cardId);
           int card2 = Integer.parseInt(o2.cardId);
+          if (card1 == card2) {
+            return 0;
+          }
           return card1 > card2 ? 1 : -1;
         }
         return val;
@@ -117,7 +115,7 @@ public void setPlaylistSwap(String p1, String p2) throws Exception {
       throw new Exception("value-in-use");
     }
     for(DropmixSharedAssetsPlaylist pl : this.getPlaylists()) {
-      if (pl.name == p1 || pl.name == p2) {
+      if (pl.name.equals(p1) || pl.name.equals(p2)) {
         if (pl.playlistCount != 15) {
           throw new Exception("invalid-playlist");
         }
@@ -187,13 +185,13 @@ public static TreeMap<String, String> getCardSwapFromPlaylist(TreeMap<String, St
     for (String key: plSwap.values()) {
       String value = plSwap.get(key);
       String validator = plSwap.get(value);
-      if (value == null || validator == null || !key.equals(validator)) {
+      if (value == null || !key.equals(validator)) {
         throw new RuntimeException("playlist-swap-sync-issue");
       }
     }
     String[] playlistNames = plSwap.keySet().toArray(new String[0]);
     DropmixSharedAssetsPlaylist[] playlists = getInstance().getPlaylists();
-    TreeMap<String, DropmixSharedAssetsPlaylist> dropmixSharedAssetsPlaylistTreeMap = new TreeMap<String, DropmixSharedAssetsPlaylist>();
+    TreeMap<String, DropmixSharedAssetsPlaylist> dropmixSharedAssetsPlaylistTreeMap = new TreeMap<>();
     TreeMap<String, String> generatedCardSwap = new TreeMap<>();
     Set<String> alreadySwappedPlaylists = new HashSet<>();
     for (DropmixSharedAssetsPlaylist pl: playlists) {
@@ -213,7 +211,7 @@ public static TreeMap<String, String> getCardSwapFromPlaylist(TreeMap<String, St
           generatedCardSwap.put(srcPl.cards[i], swapPl.cards[i]);
           generatedCardSwap.put(swapPl.cards[i], srcPl.cards[i]);
         } catch (Exception e) {
-          continue;
+          e.printStackTrace();
         }
       }
       if (includeBafflers) {
diff --git a/src/model/AppStateTest.java b/src/model/AppStateTest.java
@@ -14,7 +14,7 @@ public void getCardSwapFromPlaylist() {
     plSwap.put("highness", "sweets");
     plSwap.put("sweets", "highness");
 
-    TreeMap<String, String> cardSwap = AppState.getCardSwapFromPlaylist(plSwap);
+    TreeMap<String, String> cardSwap = AppState.getCardSwapFromPlaylist(plSwap, false);
     Assertions.assertEquals(cardSwap.size(), 30);
     Assertions.assertTrue(cardSwap.containsKey("LIC_0058_Wild"));
     Assertions.assertTrue(cardSwap.containsValue("LIC_0058_Wild"));
@@ -25,7 +25,7 @@ public void getCardSwapFromPlaylist() {
       plSwap.clear();
       plSwap.put("baffler", "promo");
       plSwap.put("promo", "baffler");
-      cardSwap = AppState.getCardSwapFromPlaylist(plSwap);
+      AppState.getCardSwapFromPlaylist(plSwap, false);
     } catch (RuntimeException e) {
       errorMessage = e.getMessage();
     }
@@ -37,7 +37,7 @@ public void getCardSwapFromPlaylist() {
       plSwap.put("instinct", "bomb");
       plSwap.put("chiller", "instinct");
       plSwap.put("bomb", "chiller");
-      cardSwap = AppState.getCardSwapFromPlaylist(plSwap);
+      AppState.getCardSwapFromPlaylist(plSwap, false);
     } catch (RuntimeException e) {
       errorMessage = e.getMessage();
     }
diff --git a/src/model/DropmixLevel0.java b/src/model/DropmixLevel0.java
@@ -1,7 +1,5 @@
 package model;
 
-import util.Helpers;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.TreeMap;
@@ -26,7 +24,7 @@ public DropmixLevel0(byte[] raw) {
     }
     this.startIdx = AbstractDropmixDataRecord.getStartIndex(raw, header);
     this.raw = raw;
-    DropmixLevel0Card headingRow = new DropmixLevel0Card(raw, this.startIdx, new HashSet<String>(), this.iOS);
+    DropmixLevel0Card headingRow = new DropmixLevel0Card(raw, this.startIdx, new HashSet<>(), this.iOS);
     for (String h: DropmixLevel0Card.headings) {
       if (!h.equals(headingRow.card.data.get(h))) {
         throw new RuntimeException("db-corrupt:bad-heading:"+ h);
@@ -36,7 +34,7 @@ public DropmixLevel0(byte[] raw) {
     int currentStart = headingRow.startIdx + headingRow.raw.length;
     int counter = 0;
     while (counter < 440) {
-      DropmixLevel0Card newCard = new DropmixLevel0Card(raw, currentStart, new HashSet<String>(), this.iOS);
+      DropmixLevel0Card newCard = new DropmixLevel0Card(raw, currentStart, new HashSet<>(), this.iOS);
       currentStart = newCard.startIdx + newCard.raw.length;
       cards[counter] = newCard;
       counter++;
@@ -60,7 +58,6 @@ public byte[] applySwap(TreeMap<String, String> cardSwaps) {
     DropmixLevel0 modifiedLevel0 = new DropmixLevel0(cloned);
     ArrayList<String> alreadySwapped = new ArrayList<>();
     cardSwaps.forEach((s1, s2) -> {
-      int idx = 0;
       for (DropmixLevel0Card c : modifiedLevel0.cards) {
         if (alreadySwapped.size() == cardSwaps.values().size()) {
           break;
@@ -74,7 +71,6 @@ public byte[] applySwap(TreeMap<String, String> cardSwaps) {
           c.updateEntry("CID", s1);
           alreadySwapped.add(s2);
         }
-        idx++;
       }
     });
     return modifiedLevel0.backToByteArray();
diff --git a/src/model/DropmixLevel0Card.java b/src/model/DropmixLevel0Card.java
@@ -113,12 +113,12 @@ public static String[] rowParser(String value) {
     boolean firstEmptyInstancePassed = false;
     for (String quoteChunk: quotesHandled) {
       // skip first empty value
-      if (quoteChunk.equals("") && builder.size() == 0) {
+      if (quoteChunk.isEmpty() && builder.isEmpty()) {
         continue;
       }
-      if (!firstEmptyInstancePassed && quoteChunk.length() == 0) {
+      if (!firstEmptyInstancePassed && quoteChunk.isEmpty()) {
         firstEmptyInstancePassed = true;
-      } else if (quoteChunk.length() > 0 && quoteChunk.charAt(0) == ',') {
+      } else if (!quoteChunk.isEmpty() && quoteChunk.charAt(0) == ',') {
         // if comma between quoted fields, skip
         if (quoteChunk.length() == 1) {
           continue;
@@ -178,7 +178,7 @@ public byte[] backToByteArray() {
             field = Helpers.addQuotes(field);
           }
         } catch (Exception e) {
-          if (field.length() > 0) {
+          if (!field.isEmpty()) {
             field = Helpers.addQuotes(field);
           }
         }
@@ -200,10 +200,7 @@ public byte[] backToByteArray() {
     }
     return newRaw;
   }
-  @Override
-  public String[] getHeadings() {
-    return DropmixLevel0Card.headings;
-  }
+
   public String toString() {
     StringBuilder sb = new StringBuilder();
     for (String h: headings) {
@@ -220,7 +217,7 @@ public String toString() {
           data = Helpers.addQuotes(data);
         }
       } catch (Exception e) {
-        if (data.length() > 0) {
+        if (!data.isEmpty()) {
           data = Helpers.addQuotes(data);
         }
       }
diff --git a/src/model/DropmixLevel0Test.java b/src/model/DropmixLevel0Test.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.Test;
 import util.Helpers;
 
-import java.util.ArrayList;
 import java.util.TreeMap;
 
 public class DropmixLevel0Test {
@@ -19,9 +18,8 @@ public void testAssets() {
   }
 
   // verifies changing fields doesn't result in the database becoming corrupted
-  // @Test
+  @Test
   public void testDatabaseConsistency() {
-    TreeMap<String, String> swapCards = new TreeMap<>();
     String[][] cardSwaps = new String[][]{
       // two swaps of just season 1, different lengths
       new String[]{ "LIC_0058_Wild", "FX_0022" },
@@ -36,13 +34,6 @@ public void testDatabaseConsistency() {
     };
     String CID = "CID";
 
-    for (String[] swap: cardSwaps) {
-      if (swap[0] == null) {
-        continue;
-      }
-      swapCards.put(swap[0], swap[1]);
-      swapCards.put(swap[1], swap[0]);
-    }
     int i = 0;
     for (DropmixLevel0Card c: dropmixLevel0.cards) {
       String cardId = c.card.data.get(CID);
diff --git a/src/model/DropmixSharedAssetsPlaylist.java b/src/model/DropmixSharedAssetsPlaylist.java
@@ -2,12 +2,9 @@
 
 import util.Helpers;
 
-import java.util.TreeMap;
-
 public class DropmixSharedAssetsPlaylist {
   public String[] cards;
   public int playlistCount;
-  public String baffler;
   public String playlistType;
   public String season;
   public String name;
@@ -87,8 +84,4 @@ public DropmixSharedAssetsPlaylist(String iconName) {
       }
     }
   }
-  public String getBaffler(String iconName) {
-    baffler = "";
-    return baffler;
-  }
 }
diff --git a/src/model/DropmixSharedAssetsSeason.java b/src/model/DropmixSharedAssetsSeason.java
@@ -33,7 +33,7 @@ public DropmixSharedAssetsSeason(byte[] rawTableData, byte[] startHeader, int st
     this.cards = new DropmixSharedAssetsCard[this.rows.length - 1];
     for (int i = 0; i < this.cards.length; i++) {
       this.cards[i] = new DropmixSharedAssetsCard(this.rows[i+1]);
-      cardIndexRef.put(this.cards[i].data.get(DropmixSharedAssetsCard.SourceCID), Integer.valueOf(i));
+      cardIndexRef.put(this.cards[i].data.get(DropmixSharedAssetsCard.SourceCID), i);
     }
   }
 
@@ -54,13 +54,7 @@ public byte[] backToByteArray(boolean includeEndNewLine) {
     }
     return seasonByteArray;
   }
-  static String getDb(byte[] b) {
-    StringBuilder sb = new StringBuilder();
-    for (byte a: b) {
-      sb.append((char) a);
-    }
-    return sb.toString();
-  }
+
   /**/
   public String[][] toNestedString() {
     String[][] nestedData = new String[this.cards.length + 1][this.columns.length];
diff --git a/src/model/DropmixSharedAssetsTest.java b/src/model/DropmixSharedAssetsTest.java
@@ -7,8 +7,7 @@
 import java.util.TreeMap;
 
 class DropmixSharedAssetsTest {
-  Helpers helper = new Helpers();
-  DropmixSharedAssets dropmixSharedAssets = new DropmixSharedAssets(helper.loadFile("sharedassets0.assets.split194"));
+  DropmixSharedAssets dropmixSharedAssets = new DropmixSharedAssets(Helpers.loadFile("sharedassets0.assets.split194"));
 
 //  @Test
 //  void validateConstructor() {
@@ -82,7 +81,6 @@ void applySwapOfPlaylists() {
       int lastIdx = 0;
       for (int k = 0; k < original.length; k++) {
         if (original[k] != modified[k] && (k - lastIdx) > range) {
-          lastIdx = k;
           byte[] r1 = Helpers.getNRange(original, k - range, range * 2);
           byte[] r2 = Helpers.getNRange(modified, k - range, range * 2);
           StringBuilder a1 = new StringBuilder();
diff --git a/src/ui/UIPlaylistActions.java b/src/ui/UIPlaylistActions.java
@@ -48,15 +48,15 @@ public void actionPerformed(ActionEvent e) {
         freshDecompile(true, false);
       }
     });
-    modApkBtn.setEnabled(as.playlistSwap.size() > 0 && verifiedModApk == null && as.currentProcess.equals(Process.NONE));
+    modApkBtn.setEnabled(!as.playlistSwap.isEmpty() && verifiedModApk == null && as.currentProcess.equals(Process.NONE));
     add(modApkBtn);
     JButton safeModApkBtn = SwingFactory.buildButton("Safe Swap", new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
         freshDecompile(true, true);
       }
     });
-    safeModApkBtn.setEnabled(as.playlistSwap.size() > 0 && verifiedModApk == null);
+    safeModApkBtn.setEnabled(!as.playlistSwap.isEmpty() && verifiedModApk == null);
     add(safeModApkBtn);
 
     JButton installApkBtn = SwingFactory.buildButton("Install APK", new ActionListener() {
@@ -85,7 +85,7 @@ public void actionPerformed(ActionEvent e) {
           System.out.println(verifiedModApk.getBytes().length + " "  + saved.toPath());
           Path savePath = saved.toPath();
           if (!savePath.toString().endsWith(".apk")) {
-            savePath = Paths.get(savePath.toString() + ".apk");
+            savePath = Paths.get(savePath + ".apk");
           }
           Files.write(savePath, Files.readAllBytes(Paths.get(verifiedModApk)));
         } catch (IOException ex) {}
@@ -174,9 +174,7 @@ public void clearState() {
       if (this.verifiedModApk != null) {
         Files.deleteIfExists(Paths.get(this.verifiedModApk));
       }
-    } catch (IOException e) {
-
-    }
+    } catch (IOException e) { }
     this.verifiedModApk = null;
     renderActions();
   }
diff --git a/src/ui/UIPlaylistsPanel.java b/src/ui/UIPlaylistsPanel.java
@@ -119,7 +119,6 @@ public void itemStateChanged(ItemEvent event) {
             that.actions.clearState();
           } catch (Exception e) {
             e.printStackTrace();
-            System.out.println(e.toString());
             box.setSelectedIndex(0);
           }
 //          if (!"Okay".equalsIgnoreCase(jTextField.getText())) {
diff --git a/src/util/Helpers.java b/src/util/Helpers.java
diff --git a/src/util/HelpersTest.java b/src/util/HelpersTest.java
diff --git a/src/util/UtilApk.java b/src/util/UtilApk.java

Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,12 @@ public static String[] rowParser(String value) {`
`113`	`113`	`boolean firstEmptyInstancePassed = false;`
`114`	`114`	`for (String quoteChunk: quotesHandled) {`
`115`	`115`	`// skip first empty value`
`116`		`- if (quoteChunk.equals("") && builder.size() == 0) {`
	`116`	`+ if (quoteChunk.isEmpty() && builder.isEmpty()) {`
`117`	`117`	`continue;`
`118`	`118`	`}`
`119`		`- if (!firstEmptyInstancePassed && quoteChunk.length() == 0) {`
	`119`	`+ if (!firstEmptyInstancePassed && quoteChunk.isEmpty()) {`
`120`	`120`	`firstEmptyInstancePassed = true;`
`121`		`- } else if (quoteChunk.length() > 0 && quoteChunk.charAt(0) == ',') {`
	`121`	`+ } else if (!quoteChunk.isEmpty() && quoteChunk.charAt(0) == ',') {`
`122`	`122`	`// if comma between quoted fields, skip`
`123`	`123`	`if (quoteChunk.length() == 1) {`
`124`	`124`	`continue;`
`@@ -178,7 +178,7 @@ public byte[] backToByteArray() {`
`178`	`178`	`field = Helpers.addQuotes(field);`
`179`	`179`	`}`
`180`	`180`	`} catch (Exception e) {`
`181`		`- if (field.length() > 0) {`
	`181`	`+ if (!field.isEmpty()) {`
`182`	`182`	`field = Helpers.addQuotes(field);`
`183`	`183`	`}`
`184`	`184`	`}`
`@@ -200,10 +200,7 @@ public byte[] backToByteArray() {`
`200`	`200`	`}`
`201`	`201`	`return newRaw;`
`202`	`202`	`}`
`203`		`- @Override`
`204`		`- public String[] getHeadings() {`
`205`		`- return DropmixLevel0Card.headings;`
`206`		`- }`
	`203`	`+`
`207`	`204`	`public String toString() {`
`208`	`205`	`StringBuilder sb = new StringBuilder();`
`209`	`206`	`for (String h: headings) {`
`@@ -220,7 +217,7 @@ public String toString() {`
`220`	`217`	`data = Helpers.addQuotes(data);`
`221`	`218`	`}`
`222`	`219`	`} catch (Exception e) {`
`223`		`- if (data.length() > 0) {`
	`220`	`+ if (!data.isEmpty()) {`
`224`	`221`	`data = Helpers.addQuotes(data);`
`225`	`222`	`}`
`226`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,9 @@`
`2`	`2`
`3`	`3`	`import util.Helpers;`
`4`	`4`
`5`		`-import java.util.TreeMap;`
`6`		`-`
`7`	`5`	`public class DropmixSharedAssetsPlaylist {`
`8`	`6`	`public String[] cards;`
`9`	`7`	`public int playlistCount;`
`10`		`- public String baffler;`
`11`	`8`	`public String playlistType;`
`12`	`9`	`public String season;`
`13`	`10`	`public String name;`
`@@ -87,8 +84,4 @@ public DropmixSharedAssetsPlaylist(String iconName) {`
`87`	`84`	`}`
`88`	`85`	`}`
`89`	`86`	`}`
`90`		`- public String getBaffler(String iconName) {`
`91`		`- baffler = "";`
`92`		`- return baffler;`
`93`		`- }`
`94`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public DropmixSharedAssetsSeason(byte[] rawTableData, byte[] startHeader, int st`
`33`	`33`	`this.cards = new DropmixSharedAssetsCard[this.rows.length - 1];`
`34`	`34`	`for (int i = 0; i < this.cards.length; i++) {`
`35`	`35`	`this.cards[i] = new DropmixSharedAssetsCard(this.rows[i+1]);`
`36`		`- cardIndexRef.put(this.cards[i].data.get(DropmixSharedAssetsCard.SourceCID), Integer.valueOf(i));`
	`36`	`+ cardIndexRef.put(this.cards[i].data.get(DropmixSharedAssetsCard.SourceCID), i);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`@@ -54,13 +54,7 @@ public byte[] backToByteArray(boolean includeEndNewLine) {`
`54`	`54`	`}`
`55`	`55`	`return seasonByteArray;`
`56`	`56`	`}`
`57`		`- static String getDb(byte[] b) {`
`58`		`- StringBuilder sb = new StringBuilder();`
`59`		`- for (byte a: b) {`
`60`		`- sb.append((char) a);`
`61`		`- }`
`62`		`- return sb.toString();`
`63`		`- }`
	`57`	`+`
`64`	`58`	`/**/`
`65`	`59`	`public String[][] toNestedString() {`
`66`	`60`	`String[][] nestedData = new String[this.cards.length + 1][this.columns.length];`