LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-01 19:34:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch for deobfuscation modes changed to checkbox (reset to disable old mode)

Browse Source
This commit is contained in:
Jindra Petřík
2015-07-04 16:34:53 +02:00
parent 03f6b4729e
commit 1c338b18ca
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
View File

@@ -330,7 +330,7 @@ public final class MethodBody implements Cloneable {
b.getCode().markMappedOffsets();
if (Configuration.autoDeobfuscate.get()) {
if (Configuration.deobfuscationMode.get() == 0) {
if (Configuration.deobfuscationOldMode.get()) {
try {
b.getCode().removeTraps(constants, trait, method_info.get(this.method_info), b, abc, scriptIndex, classIndex, isStatic, path);
} catch (Throwable ex) {

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
View File

@@ -92,7 +92,7 @@ public class ActionListReader {
*/
public static ActionList readActionListTimeout(final List<DisassemblyListener> listeners, final SWFInputStream sis, final int version, final int ip, final int endIp, final String path) throws IOException, InterruptedException, TimeoutException {
try {
final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? Configuration.deobfuscationMode.get() : -1;
final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? (Configuration.deobfuscationOldMode.get() ? 0 : 1) : -1;
ActionList actions = CancellableWorker.call(new Callable<ActionList>() {
@Override

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -90,9 +90,9 @@ public class Configuration {
@ConfigurationCategory("script")
public static final ConfigurationItem<Boolean> autoDeobfuscate = null;
@ConfigurationDefaultInt(1)
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("")
public static final ConfigurationItem<Integer> deobfuscationMode = null;
public static final ConfigurationItem<Boolean> deobfuscationOldMode = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("")