diff --git a/README.md b/README.md index 9c17263b0092623247dfa62f81a760c17da56c1f..57a03f32fab8cb3c22936c107833565eb52b32cb 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,6 @@ options: 'read-or-save' - read if found, save otherwise (don't overwrite) 'overwrite' - don't read, always save 'ignore' - don't read and don't save - --deobf-rewrite-cfg - set '--deobf-cfg-file-mode' to 'overwrite' (deprecated) --deobf-use-sourcename - use source file name as class name alias --deobf-parse-kotlin-metadata - parse kotlin metadata to class and package names --use-kotlin-methods-for-var-names - use kotlin intrinsic methods to rename variables, values: disable, apply, apply-and-hide, default: apply diff --git a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java b/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java index 1c45d860c614f1c150394c89e0494a4d9c3bd82f..b80c783bbe7ec72747393dbccebcf5cb45b4612c 100644 --- a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java +++ b/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java @@ -123,9 +123,6 @@ public class JadxCLIArgs { ) protected DeobfuscationMapFileMode deobfuscationMapFileMode = DeobfuscationMapFileMode.READ; - @Parameter(names = { "--deobf-rewrite-cfg" }, description = "set '--deobf-cfg-file-mode' to 'overwrite' (deprecated)") - protected boolean deobfuscationForceSave = false; - @Parameter(names = { "--deobf-use-sourcename" }, description = "use source file name as class name alias") protected boolean deobfuscationUseSourceNameAsAlias = false; @@ -259,11 +256,7 @@ public class JadxCLIArgs { args.setReplaceConsts(replaceConsts); args.setDeobfuscationOn(deobfuscationOn); args.setDeobfuscationMapFile(FileUtils.toFile(deobfuscationMapFile)); - if (deobfuscationForceSave) { - args.setDeobfuscationMapFileMode(DeobfuscationMapFileMode.OVERWRITE); - } else { - args.setDeobfuscationMapFileMode(deobfuscationMapFileMode); - } + args.setDeobfuscationMapFileMode(deobfuscationMapFileMode); args.setDeobfuscationMinLength(deobfuscationMinLength); args.setDeobfuscationMaxLength(deobfuscationMaxLength); args.setUseSourceNameAsClassAlias(deobfuscationUseSourceNameAsAlias); @@ -377,10 +370,6 @@ public class JadxCLIArgs { return deobfuscationMapFileMode; } - public boolean isDeobfuscationForceSave() { - return deobfuscationForceSave; - } - public boolean isDeobfuscationUseSourceNameAsAlias() { return deobfuscationUseSourceNameAsAlias; } diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java index bdbde34d08e2498c4ff5d700087194719a91a945..00f3f6991636db716df0474914bfaf60d6f14e76 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java @@ -695,11 +695,7 @@ public class JadxSettings extends JadxCLIArgs { fromVersion++; } if (fromVersion == 15) { - if (deobfuscationForceSave) { - deobfuscationMapFileMode = DeobfuscationMapFileMode.OVERWRITE; - } else { - deobfuscationMapFileMode = DeobfuscationMapFileMode.READ; - } + deobfuscationMapFileMode = DeobfuscationMapFileMode.READ; fromVersion++; } if (fromVersion == 16) {