Fixed deobfuscation in toplevel

This commit is contained in:
Jindra Petřík
2016-09-18 00:05:21 +02:00
parent a6a6568bbb
commit 4d4ca347d2

View File

@@ -227,8 +227,8 @@ public class IdentifiersDeobfuscation {
name = changedName;
}
if (changed) {
String newClassName = "";
if (pkg == null) {
String newClassName;
if ((pkg == null) || (pkg.isEmpty()) || (pkg.isTopLevel())) {
newClassName = name;
} else {
newClassName = pkg + "." + name;
@@ -283,7 +283,6 @@ public class IdentifiersDeobfuscation {
}
public String deobfuscateName(boolean as3, String s, boolean firstUppercase, String usageType, HashMap<DottedChain, DottedChain> namesMap, RenameType renameType, Map<DottedChain, DottedChain> selected) {
boolean isValid = true;
if (usageType == null) {
usageType = "name";
}
@@ -295,7 +294,7 @@ public class IdentifiersDeobfuscation {
}
}
isValid = isValidName(as3, s);
boolean isValid = isValidName(as3, s);
if (!isValid) {
if (namesMap.containsKey(sChain)) {
return namesMap.get(sChain).toRawString();