未验证 提交 39331d91 编写于 作者: S Skylot

fix: remove deprecated `--deobf-rewrite-cfg` (#1513)

上级 b4fa6644
...@@ -115,7 +115,6 @@ options: ...@@ -115,7 +115,6 @@ options:
'read-or-save' - read if found, save otherwise (don't overwrite) 'read-or-save' - read if found, save otherwise (don't overwrite)
'overwrite' - don't read, always save 'overwrite' - don't read, always save
'ignore' - don't read and don't 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-use-sourcename - use source file name as class name alias
--deobf-parse-kotlin-metadata - parse kotlin metadata to class and package names --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 --use-kotlin-methods-for-var-names - use kotlin intrinsic methods to rename variables, values: disable, apply, apply-and-hide, default: apply
......
...@@ -123,9 +123,6 @@ public class JadxCLIArgs { ...@@ -123,9 +123,6 @@ public class JadxCLIArgs {
) )
protected DeobfuscationMapFileMode deobfuscationMapFileMode = DeobfuscationMapFileMode.READ; 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") @Parameter(names = { "--deobf-use-sourcename" }, description = "use source file name as class name alias")
protected boolean deobfuscationUseSourceNameAsAlias = false; protected boolean deobfuscationUseSourceNameAsAlias = false;
...@@ -259,11 +256,7 @@ public class JadxCLIArgs { ...@@ -259,11 +256,7 @@ public class JadxCLIArgs {
args.setReplaceConsts(replaceConsts); args.setReplaceConsts(replaceConsts);
args.setDeobfuscationOn(deobfuscationOn); args.setDeobfuscationOn(deobfuscationOn);
args.setDeobfuscationMapFile(FileUtils.toFile(deobfuscationMapFile)); args.setDeobfuscationMapFile(FileUtils.toFile(deobfuscationMapFile));
if (deobfuscationForceSave) { args.setDeobfuscationMapFileMode(deobfuscationMapFileMode);
args.setDeobfuscationMapFileMode(DeobfuscationMapFileMode.OVERWRITE);
} else {
args.setDeobfuscationMapFileMode(deobfuscationMapFileMode);
}
args.setDeobfuscationMinLength(deobfuscationMinLength); args.setDeobfuscationMinLength(deobfuscationMinLength);
args.setDeobfuscationMaxLength(deobfuscationMaxLength); args.setDeobfuscationMaxLength(deobfuscationMaxLength);
args.setUseSourceNameAsClassAlias(deobfuscationUseSourceNameAsAlias); args.setUseSourceNameAsClassAlias(deobfuscationUseSourceNameAsAlias);
...@@ -377,10 +370,6 @@ public class JadxCLIArgs { ...@@ -377,10 +370,6 @@ public class JadxCLIArgs {
return deobfuscationMapFileMode; return deobfuscationMapFileMode;
} }
public boolean isDeobfuscationForceSave() {
return deobfuscationForceSave;
}
public boolean isDeobfuscationUseSourceNameAsAlias() { public boolean isDeobfuscationUseSourceNameAsAlias() {
return deobfuscationUseSourceNameAsAlias; return deobfuscationUseSourceNameAsAlias;
} }
......
...@@ -695,11 +695,7 @@ public class JadxSettings extends JadxCLIArgs { ...@@ -695,11 +695,7 @@ public class JadxSettings extends JadxCLIArgs {
fromVersion++; fromVersion++;
} }
if (fromVersion == 15) { if (fromVersion == 15) {
if (deobfuscationForceSave) { deobfuscationMapFileMode = DeobfuscationMapFileMode.READ;
deobfuscationMapFileMode = DeobfuscationMapFileMode.OVERWRITE;
} else {
deobfuscationMapFileMode = DeobfuscationMapFileMode.READ;
}
fromVersion++; fromVersion++;
} }
if (fromVersion == 16) { if (fromVersion == 16) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册