simplify pass

Author: nklapste

src/main/java/jadx/plugins/stringdecoder/B64DeobfuscatePass.java

@@ -93,29 +93,30 @@ public void visit(MethodNode mth) {
 				FilledNewArrayNode arrayParent = findFilledNewArrayParent(csn);
 				if (arrayParent != null) {
 					int idx = argIndexOf(arrayParent, csn.getResult().getSVar());
-					if (idx >= 0) {
-						// Determine the best available decoded value for this slot
-						String candidate = decoded != null ? decoded
-								: B64Detector.decodeIfValid(str, options.getMaxCommentLength());
-						if (candidate != null) {
-							if (fieldConstants == null) {
-								fieldConstants = collectConstantValueFieldStrings(mth.getParentClass());
+					if (idx < 0) {
+						continue;
+					}
+					// Determine the best available decoded value for this slot
+					String candidate = decoded != null ? decoded
+							: B64Detector.decodeIfValid(str, options.getMaxCommentLength());
+					if (candidate != null) {
+						if (fieldConstants == null) {
+							fieldConstants = collectConstantValueFieldStrings(mth.getParentClass());
+						}
+						if (!fieldConstants.contains(str)) {
+							if (arrayCandidates == null) {
+								arrayCandidates = new LinkedHashMap<>();
 							}
-							if (!fieldConstants.contains(str)) {
-								if (arrayCandidates == null) {
-									arrayCandidates = new LinkedHashMap<>();
-								}
-								arrayCandidates.computeIfAbsent(arrayParent, k -> new TreeMap<>()).put(idx, candidate);
-								if (decoded != null) {
-									if (arrayAnchors == null) {
-										arrayAnchors = new LinkedHashSet<>();
-									}
-									arrayAnchors.add(arrayParent);
+							arrayCandidates.computeIfAbsent(arrayParent, k -> new TreeMap<>()).put(idx, candidate);
+							if (decoded != null) {
+								if (arrayAnchors == null) {
+									arrayAnchors = new LinkedHashSet<>();
 								}
+								arrayAnchors.add(arrayParent);
 							}
 						}
-						continue;
 					}
+					continue;
 				}
 
 				if (decoded == null) {
@@ -172,12 +173,6 @@ private static int argIndexOf(InsnNode insn, SSAVar ssaVar) {
 		return -1;
 	}
 
-	/**
-	 * Builds a multi-line comment text for all decoded strings in a FilledNewArrayNode.
-	 * Each entry is formatted as "b64[N]: decoded" on its own line, sorted by index.
-	 * The renderer (appendMultiLineString) splits on \n and starts each continuation
-	 * line with "// ", producing one "// b64[N]: ..." line per decoded string.
-	 */
 	private static String buildArrayComment(TreeMap<Integer, String> decodings) {
 		StringBuilder sb = new StringBuilder();
 		for (Map.Entry<Integer, String> e : decodings.entrySet()) {

src/main/java/jadx/plugins/stringdecoder/B64Detector.java

@@ -13,7 +13,10 @@ public final class B64Detector {
 	// Allow embedded \n/\r (PEM/MIME line-wrapped Base64); = padding and trailing newline are optional
 	private static final Pattern BASE64_STANDARD = Pattern.compile("^[A-Za-z0-9+/\\n\\r]*=*[\\n\\r]*$");
 	private static final Pattern BASE64_URL_SAFE = Pattern.compile("^[A-Za-z0-9_\\-\\n\\r]*=*[\\n\\r]*$");
-private B64Detector() {
+	private static final Base64.Decoder[] STANDARD_AND_URL = { Base64.getDecoder(), Base64.getUrlDecoder() };
+	private static final Base64.Decoder[] ALL_DECODERS = { Base64.getDecoder(), Base64.getUrlDecoder(), Base64.getMimeDecoder() };
+
+	private B64Detector() {
 	}
 
 	/**
@@ -117,7 +120,7 @@ public static String decodeIfValid(String str, int maxCommentLength) {
 		if (!BASE64_STANDARD.matcher(str).matches() && !BASE64_URL_SAFE.matcher(str).matches()) {
 			return null;
 		}
-		for (Base64.Decoder decoder : new Base64.Decoder[] { Base64.getDecoder(), Base64.getUrlDecoder() }) {
+		for (Base64.Decoder decoder : STANDARD_AND_URL) {
 			try {
 				byte[] bytes = decoder.decode(str);
 				CharsetDecoder utf8 = StandardCharsets.UTF_8.newDecoder()
@@ -138,7 +141,7 @@ public static String decodeIfValid(String str, int maxCommentLength) {
 	 * Invalid UTF-8 bytes are replaced rather than causing a rejection.
 	 */
 	public static String decodeForced(String str, int maxCommentLength) {
-		for (Base64.Decoder decoder : new Base64.Decoder[]{Base64.getDecoder(), Base64.getUrlDecoder(), Base64.getMimeDecoder()}) {
+		for (Base64.Decoder decoder : ALL_DECODERS) {
 			try {
 				byte[] bytes = decoder.decode(str);
 				CharsetDecoder utf8 = StandardCharsets.UTF_8.newDecoder()