removing duplicate definitions of isDecodeCall

Author: nklapste

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

@@ -0,0 +1,28 @@
+package jadx.plugins.stringdecoder;
+
+import java.util.Locale;
+
+import jadx.core.dex.info.MethodInfo;
+import jadx.core.dex.instructions.InvokeNode;
+import jadx.core.dex.nodes.InsnNode;
+
+/**
+ * Recognises calls to {@code Base64.decode}-like methods: any invoke whose declaring class name
+ * contains "base64" and whose method name contains "decode" (case-insensitive). A direct string
+ * argument to such a call is strong evidence of intent, so callers decode it without heuristics.
+ */
+final class B64DecodeCalls {
+
+	private B64DecodeCalls() {
+	}
+
+	/** True if {@code insn} is an invoke of a Base64.decode-like method. */
+	static boolean isDecodeCall(InsnNode insn) {
+		if (!(insn instanceof InvokeNode)) {
+			return false;
+		}
+		MethodInfo mth = ((InvokeNode) insn).getCallMth();
+		return mth.getDeclClass().getFullName().toLowerCase(Locale.ROOT).contains("base64")
+				&& mth.getName().toLowerCase(Locale.ROOT).contains("decode");
+	}
+}

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

@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -22,7 +21,6 @@
 import jadx.core.codegen.utils.CodeComment;
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.AType;
-import jadx.core.dex.info.MethodInfo;
 import jadx.core.dex.instructions.ConstStringNode;
 import jadx.core.dex.instructions.FilledNewArrayNode;
 import jadx.core.dex.instructions.InvokeNode;
@@ -287,16 +285,7 @@ private static boolean isUsedAsBase64DecodeArg(ConstStringNode csn) {
 		if (v == null) {
 			return false;
 		}
-		return v.getUseList().stream().anyMatch(use -> isBase64DecodeCall(use.getParentInsn()));
-	}
-
-	private static boolean isBase64DecodeCall(InsnNode insn) {
-		if (!(insn instanceof InvokeNode)) {
-			return false;
-		}
-		MethodInfo mth = ((InvokeNode) insn).getCallMth();
-		return mth.getDeclClass().getFullName().toLowerCase(Locale.ROOT).contains("base64")
-				&& mth.getName().toLowerCase(Locale.ROOT).contains("decode");
+		return v.getUseList().stream().anyMatch(use -> B64DecodeCalls.isDecodeCall(use.getParentInsn()));
 	}
 
 	private static Set<String> collectConstantValueFieldStrings(ClassNode cls) {

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

@@ -1,6 +1,5 @@
 package jadx.plugins.stringdecoder;
 
-import java.util.Locale;
 import java.util.TreeMap;
 
 import jadx.api.plugins.input.data.annotations.EncodedType;
@@ -12,12 +11,10 @@
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.FieldInitInsnAttr;
 import jadx.core.dex.info.FieldInfo;
-import jadx.core.dex.info.MethodInfo;
 import jadx.core.dex.instructions.ConstStringNode;
 import jadx.core.dex.instructions.FilledNewArrayNode;
 import jadx.core.dex.instructions.IndexInsnNode;
 import jadx.core.dex.instructions.InsnType;
-import jadx.core.dex.instructions.InvokeNode;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.InsnWrapArg;
 import jadx.core.dex.instructions.args.RegisterArg;
@@ -142,7 +139,7 @@ private boolean findAndAnnotateInArgTree(FieldNode field, InsnNode insn, int dep
 		if (insn == null || depth > MAX_ARG_TREE_DEPTH) {
 			return false;
 		}
-		boolean isBase64Call = isBase64DecodeCall(insn);
+		boolean isBase64Call = B64DecodeCalls.isDecodeCall(insn);
 		for (int i = 0; i < insn.getArgsCount(); i++) {
 			InsnNode argInsn = resolveArgInsn(insn.getArg(i));
 			if (argInsn == null) {
@@ -225,13 +222,4 @@ private boolean annotateField(FieldNode field, String str, boolean forced) {
 		field.addCodeComment(result.commentText());
 		return true;
 	}
-
-	private static boolean isBase64DecodeCall(InsnNode insn) {
-		if (!(insn instanceof InvokeNode)) {
-			return false;
-		}
-		MethodInfo mth = ((InvokeNode) insn).getCallMth();
-		return mth.getDeclClass().getFullName().toLowerCase(Locale.ROOT).contains("base64")
-				&& mth.getName().toLowerCase(Locale.ROOT).contains("decode");
-	}
 }