core: allow to disable constant dereference (#106)

jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java

@@ -17,6 +17,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterDescription;
@@ -33,9 +34,6 @@ public class JadxCLIArgs implements IJadxArgs {
 	@Parameter(names = {"-j", "--threads-count"}, description = "processing threads count")
 	protected int threadsCount = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
 
-	@Parameter(names = {"-f", "--fallback"}, description = "make simple dump (using goto instead of 'if', 'for', etc)")
-	protected boolean fallbackMode = false;
-
 	@Parameter(names = {"-r", "--no-res"}, description = "do not decode resources")
 	protected boolean skipResources = false;
 
@@ -45,14 +43,12 @@ public class JadxCLIArgs implements IJadxArgs {
 	@Parameter(names = {"--show-bad-code"}, description = "show inconsistent code (incorrectly decompiled)")
 	protected boolean showInconsistentCode = false;
 
-	@Parameter(names = {"--cfg"}, description = "save methods control flow graph to dot file")
-	protected boolean cfgOutput = false;
+	@Parameter(names = "--no-replace-consts", converter = InvertedBooleanConverter.class,
+			description = "don't replace constant value with matching constant field")
+	protected boolean replaceConsts = true;
 
-	@Parameter(names = {"--raw-cfg"}, description = "save methods control flow graph (use raw instructions)")
-	protected boolean rawCfgOutput = false;
-
-	@Parameter(names = {"-v", "--verbose"}, description = "verbose output")
-	protected boolean verbose = false;
+	@Parameter(names = {"--escape-unicode"}, description = "escape non latin characters in strings (with \\u)")
+	protected boolean escapeUnicode = false;
 
 	@Parameter(names = {"--deobf"}, description = "activate deobfuscation")
 	protected boolean deobfuscationOn = false;
@@ -69,8 +65,17 @@ public class JadxCLIArgs implements IJadxArgs {
 	@Parameter(names = {"--deobf-use-sourcename"}, description = "use source file name as class name alias")
 	protected boolean deobfuscationUseSourceNameAsAlias = false;
 
-	@Parameter(names = {"--escape-unicode"}, description = "escape non latin characters in strings (with \\u)")
-	protected boolean escapeUnicode = false;
+	@Parameter(names = {"--cfg"}, description = "save methods control flow graph to dot file")
+	protected boolean cfgOutput = false;
+
+	@Parameter(names = {"--raw-cfg"}, description = "save methods control flow graph (use raw instructions)")
+	protected boolean rawCfgOutput = false;
+
+	@Parameter(names = {"-f", "--fallback"}, description = "make simple dump (using goto instead of 'if', 'for', etc)")
+	protected boolean fallbackMode = false;
+
+	@Parameter(names = {"-v", "--verbose"}, description = "verbose output")
+	protected boolean verbose = false;
 
 	@Parameter(names = {"-h", "--help"}, description = "print this help", help = true)
 	protected boolean printHelp = false;
@@ -178,6 +183,13 @@ public class JadxCLIArgs implements IJadxArgs {
 		}
 	}
 
+	public static class InvertedBooleanConverter implements IStringConverter<Boolean> {
+		@Override
+		public Boolean convert(String value) {
+			return "false".equals(value);
+		}
+	}
+
 	public List<File> getInput() {
 		return input;
 	}
@@ -264,4 +276,9 @@ public class JadxCLIArgs implements IJadxArgs {
 	public boolean escapeUnicode() {
 		return escapeUnicode;
 	}
+
+	@Override
+	public boolean isReplaceConsts() {
+		return replaceConsts;
+	}
 }

jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java

@@ -0,0 +1,22 @@
+package jadx.cli;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class JadxCLIArgsTest {
+
+	@Test
+	public void testInvertedBooleanOption() throws Exception {
+		assertThat(parse("--no-replace-consts").isReplaceConsts(), is(false));
+		assertThat(parse("").isReplaceConsts(), is(true));
+	}
+
+	private JadxCLIArgs parse(String... args) {
+		JadxCLIArgs jadxArgs = new JadxCLIArgs();
+		boolean res = jadxArgs.processArgs(args);
+		assertThat(res, is(true));
+		return jadxArgs;
+	}
+}