Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
11cee083
Commit
11cee083
authored
Mar 24, 2019
by
Ahmed Ashour
Committed by
skylot
Mar 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style: use character instead of string, for better performance (PR #503)
parent
6e66dc25
Hide whitespace changes
Inline
Side-by-side
Showing
72 changed files
with
116 additions
and
116 deletions
+116
-116
JCommanderWrapper.java
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
+1
-1
CodePosition.java
jadx-core/src/main/java/jadx/api/CodePosition.java
+1
-1
JadxArgsValidator.java
jadx-core/src/main/java/jadx/api/JadxArgsValidator.java
+1
-1
JavaField.java
jadx-core/src/main/java/jadx/api/JavaField.java
+1
-1
ResourceFile.java
jadx-core/src/main/java/jadx/api/ResourceFile.java
+1
-1
ClsSet.java
jadx-core/src/main/java/jadx/core/clsp/ClsSet.java
+1
-1
AnnotationGen.java
jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
+1
-1
ClassGen.java
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+1
-1
InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+2
-2
MethodGen.java
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
+3
-3
NameGen.java
jadx-core/src/main/java/jadx/core/codegen/NameGen.java
+1
-1
TypeGen.java
jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
+3
-3
Deobfuscator.java
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
+2
-2
AttributeStorage.java
.../main/java/jadx/core/dex/attributes/AttributeStorage.java
+1
-1
Annotation.java
...java/jadx/core/dex/attributes/annotations/Annotation.java
+1
-1
EdgeInsnAttr.java
...ain/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java
+1
-1
FieldReplaceAttr.java
...java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java
+1
-1
JadxError.java
...c/main/java/jadx/core/dex/attributes/nodes/JadxError.java
+1
-1
PhiListAttr.java
...main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
+1
-1
AccessInfo.java
jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java
+1
-1
ClassInfo.java
jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java
+3
-3
FieldInfo.java
jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java
+3
-3
MethodInfo.java
jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java
+5
-5
ArithNode.java
...e/src/main/java/jadx/core/dex/instructions/ArithNode.java
+2
-2
ConstClassNode.java
.../main/java/jadx/core/dex/instructions/ConstClassNode.java
+1
-1
ConstStringNode.java
...main/java/jadx/core/dex/instructions/ConstStringNode.java
+1
-1
IfNode.java
...core/src/main/java/jadx/core/dex/instructions/IfNode.java
+1
-1
IndexInsnNode.java
...c/main/java/jadx/core/dex/instructions/IndexInsnNode.java
+1
-1
InsnDecoder.java
...src/main/java/jadx/core/dex/instructions/InsnDecoder.java
+1
-1
InvokeNode.java
.../src/main/java/jadx/core/dex/instructions/InvokeNode.java
+1
-1
ArgType.java
...rc/main/java/jadx/core/dex/instructions/args/ArgType.java
+4
-4
FieldArg.java
...c/main/java/jadx/core/dex/instructions/args/FieldArg.java
+1
-1
InsnWrapArg.java
...ain/java/jadx/core/dex/instructions/args/InsnWrapArg.java
+1
-1
LiteralArg.java
...main/java/jadx/core/dex/instructions/args/LiteralArg.java
+2
-2
NamedArg.java
...c/main/java/jadx/core/dex/instructions/args/NamedArg.java
+1
-1
RegisterArg.java
...ain/java/jadx/core/dex/instructions/args/RegisterArg.java
+4
-4
SSAVar.java
...src/main/java/jadx/core/dex/instructions/args/SSAVar.java
+1
-1
ConstructorInsn.java
...java/jadx/core/dex/instructions/mods/ConstructorInsn.java
+1
-1
BlockNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
+1
-1
MethodNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
+1
-1
LocalVar.java
...re/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java
+2
-2
SignatureParser.java
...main/java/jadx/core/dex/nodes/parser/SignatureParser.java
+1
-1
Region.java
jadx-core/src/main/java/jadx/core/dex/regions/Region.java
+1
-1
Compare.java
...c/main/java/jadx/core/dex/regions/conditions/Compare.java
+1
-1
IfCondition.java
...in/java/jadx/core/dex/regions/conditions/IfCondition.java
+1
-1
IfRegion.java
.../main/java/jadx/core/dex/regions/conditions/IfRegion.java
+1
-1
ExcHandlerAttr.java
.../src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java
+1
-1
CodeShrinker.java
...re/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
+2
-2
DotGraphVisitor.java
...src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
+2
-2
ModVisitor.java
...core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
+1
-1
RenameVisitor.java
...e/src/main/java/jadx/core/dex/visitors/RenameVisitor.java
+1
-1
BlocksPair.java
...adx/core/dex/visitors/blocksmaker/helpers/BlocksPair.java
+1
-1
BlocksRemoveInfo.java
...re/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
+2
-2
ProcessVariables.java
...java/jadx/core/dex/visitors/regions/ProcessVariables.java
+1
-1
RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+1
-1
InsnUtils.java
jadx-core/src/main/java/jadx/core/utils/InsnUtils.java
+1
-1
AndroidResourcesUtils.java
...n/java/jadx/core/utils/android/AndroidResourcesUtils.java
+1
-1
DexFile.java
jadx-core/src/main/java/jadx/core/utils/files/DexFile.java
+1
-1
FileUtils.java
jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
+2
-2
BinaryXMLParser.java
...-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+9
-9
ManifestAttributes.java
...re/src/main/java/jadx/core/xmlgen/ManifestAttributes.java
+2
-2
ResContainer.java
jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java
+2
-2
ResTableParser.java
jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java
+1
-1
ResXmlGen.java
jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
+2
-2
ResourceStorage.java
...-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java
+1
-1
EntryConfig.java
...ore/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
+4
-4
ResourceEntry.java
...e/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java
+1
-1
ValuesParser.java
...re/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java
+4
-4
JadxSettingsWindow.java
...i/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
+1
-1
JMethod.java
jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
+1
-1
JSources.java
jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java
+1
-1
SearchBar.java
jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
+1
-1
No files found.
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
View file @
11cee083
...
@@ -90,7 +90,7 @@ public class JCommanderWrapper<T> {
...
@@ -90,7 +90,7 @@ public class JCommanderWrapper<T> {
if
(
fieldType
==
int
.
class
)
{
if
(
fieldType
==
int
.
class
)
{
try
{
try
{
int
val
=
f
.
getInt
(
args
);
int
val
=
f
.
getInt
(
args
);
opt
.
append
(
" (default: "
).
append
(
val
).
append
(
")"
);
opt
.
append
(
" (default: "
).
append
(
val
).
append
(
')'
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// ignore
// ignore
}
}
...
...
jadx-core/src/main/java/jadx/api/CodePosition.java
View file @
11cee083
...
@@ -57,6 +57,6 @@ public final class CodePosition {
...
@@ -57,6 +57,6 @@ public final class CodePosition {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
line
+
":"
+
offset
+
(
node
!=
null
?
" "
+
node
:
""
);
return
line
+
':'
+
offset
+
(
node
!=
null
?
" "
+
node
:
""
);
}
}
}
}
jadx-core/src/main/java/jadx/api/JadxArgsValidator.java
View file @
11cee083
...
@@ -77,7 +77,7 @@ public class JadxArgsValidator {
...
@@ -77,7 +77,7 @@ public class JadxArgsValidator {
if
(
pos
!=
-
1
)
{
if
(
pos
!=
-
1
)
{
outDirName
=
name
.
substring
(
0
,
pos
);
outDirName
=
name
.
substring
(
0
,
pos
);
}
else
{
}
else
{
outDirName
=
name
+
"-"
+
JadxArgs
.
DEFAULT_OUT_DIR
;
outDirName
=
name
+
'-'
+
JadxArgs
.
DEFAULT_OUT_DIR
;
}
}
LOG
.
info
(
"output directory: {}"
,
outDirName
);
LOG
.
info
(
"output directory: {}"
,
outDirName
);
outDir
=
new
File
(
outDirName
);
outDir
=
new
File
(
outDirName
);
...
...
jadx-core/src/main/java/jadx/api/JavaField.java
View file @
11cee083
...
@@ -21,7 +21,7 @@ public final class JavaField implements JavaNode {
...
@@ -21,7 +21,7 @@ public final class JavaField implements JavaNode {
@Override
@Override
public
String
getFullName
()
{
public
String
getFullName
()
{
return
parent
.
getFullName
()
+
"."
+
getName
();
return
parent
.
getFullName
()
+
'.'
+
getName
();
}
}
@Override
@Override
...
...
jadx-core/src/main/java/jadx/api/ResourceFile.java
View file @
11cee083
...
@@ -70,6 +70,6 @@ public class ResourceFile {
...
@@ -70,6 +70,6 @@ public class ResourceFile {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"ResourceFile{name='"
+
name
+
'\''
+
", type="
+
type
+
"}"
;
return
"ResourceFile{name='"
+
name
+
'\''
+
", type="
+
type
+
'}'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/clsp/ClsSet.java
View file @
11cee083
...
@@ -113,7 +113,7 @@ public class ClsSet {
...
@@ -113,7 +113,7 @@ public class ClsSet {
}
else
if
(
outputName
.
endsWith
(
".jar"
))
{
}
else
if
(
outputName
.
endsWith
(
".jar"
))
{
ZipOutputStream
out
=
new
ZipOutputStream
(
outputStream
);
ZipOutputStream
out
=
new
ZipOutputStream
(
outputStream
);
try
{
try
{
out
.
putNextEntry
(
new
ZipEntry
(
CLST_PKG_PATH
+
"/"
+
CLST_FILENAME
));
out
.
putNextEntry
(
new
ZipEntry
(
CLST_PKG_PATH
+
'/'
+
CLST_FILENAME
));
save
(
out
);
save
(
out
);
}
finally
{
}
finally
{
close
(
out
);
close
(
out
);
...
...
jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
View file @
11cee083
...
@@ -164,7 +164,7 @@ public class AnnotationGen {
...
@@ -164,7 +164,7 @@ public class AnnotationGen {
formatAnnotation
(
code
,
(
Annotation
)
val
);
formatAnnotation
(
code
,
(
Annotation
)
val
);
}
else
{
}
else
{
// TODO: also can be method values
// TODO: also can be method values
throw
new
JadxRuntimeException
(
"Can't decode value: "
+
val
+
" ("
+
val
.
getClass
()
+
")"
);
throw
new
JadxRuntimeException
(
"Can't decode value: "
+
val
+
" ("
+
val
.
getClass
()
+
')'
);
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
View file @
11cee083
...
@@ -535,7 +535,7 @@ public class ClassGen {
...
@@ -535,7 +535,7 @@ public class ClassGen {
&&
importCls
.
getShortName
().
equals
(
shortName
))
{
&&
importCls
.
getShortName
().
equals
(
shortName
))
{
if
(
extClsInfo
.
isInner
())
{
if
(
extClsInfo
.
isInner
())
{
String
parent
=
useClassInternal
(
useCls
,
extClsInfo
.
getParentClass
().
getAlias
());
String
parent
=
useClassInternal
(
useCls
,
extClsInfo
.
getParentClass
().
getAlias
());
return
parent
+
"."
+
shortName
;
return
parent
+
'.'
+
shortName
;
}
else
{
}
else
{
return
fullName
;
return
fullName
;
}
}
...
...
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
View file @
11cee083
...
@@ -509,12 +509,12 @@ public class InsnGen {
...
@@ -509,12 +509,12 @@ public class InsnGen {
case
PHI:
case
PHI:
case
MERGE:
case
MERGE:
fallbackOnlyInsn
(
insn
);
fallbackOnlyInsn
(
insn
);
code
.
add
(
insn
.
getType
().
toString
()).
add
(
"("
);
code
.
add
(
insn
.
getType
().
toString
()).
add
(
'('
);
for
(
InsnArg
insnArg
:
insn
.
getArguments
())
{
for
(
InsnArg
insnArg
:
insn
.
getArguments
())
{
addArg
(
code
,
insnArg
);
addArg
(
code
,
insnArg
);
code
.
add
(
' '
);
code
.
add
(
' '
);
}
}
code
.
add
(
")"
);
code
.
add
(
')'
);
break
;
break
;
default
:
default
:
...
...
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
View file @
11cee083
...
@@ -175,9 +175,9 @@ public class MethodGen {
...
@@ -175,9 +175,9 @@ public class MethodGen {
code
.
startLine
(
"throw new UnsupportedOperationException(\"Method not decompiled: "
)
code
.
startLine
(
"throw new UnsupportedOperationException(\"Method not decompiled: "
)
.
add
(
clsAlias
.
makeFullClsName
(
clsAlias
.
getShortName
(),
true
))
.
add
(
clsAlias
.
makeFullClsName
(
clsAlias
.
getShortName
(),
true
))
.
add
(
"."
)
.
add
(
'.'
)
.
add
(
mth
.
getAlias
())
.
add
(
mth
.
getAlias
())
.
add
(
"("
)
.
add
(
'('
)
.
add
(
Utils
.
listToString
(
mth
.
getMethodInfo
().
getArgumentsTypes
()))
.
add
(
Utils
.
listToString
(
mth
.
getMethodInfo
().
getArgumentsTypes
()))
.
add
(
"):"
)
.
add
(
"):"
)
.
add
(
mth
.
getMethodInfo
().
getReturnType
().
toString
())
.
add
(
mth
.
getMethodInfo
().
getReturnType
().
toString
())
...
@@ -219,7 +219,7 @@ public class MethodGen {
...
@@ -219,7 +219,7 @@ public class MethodGen {
}
}
if
(
addLabels
&&
(
insn
.
contains
(
AType
.
JUMP
)
||
insn
.
contains
(
AType
.
EXC_HANDLER
)))
{
if
(
addLabels
&&
(
insn
.
contains
(
AType
.
JUMP
)
||
insn
.
contains
(
AType
.
EXC_HANDLER
)))
{
code
.
decIndent
();
code
.
decIndent
();
code
.
startLine
(
getLabelName
(
insn
.
getOffset
())
+
":"
);
code
.
startLine
(
getLabelName
(
insn
.
getOffset
())
+
':'
);
code
.
incIndent
();
code
.
incIndent
();
}
}
try
{
try
{
...
...
jadx-core/src/main/java/jadx/core/codegen/NameGen.java
View file @
11cee083
...
@@ -109,7 +109,7 @@ public class NameGen {
...
@@ -109,7 +109,7 @@ public class NameGen {
String
name
=
arg
.
getName
();
String
name
=
arg
.
getName
();
String
varName
=
name
!=
null
?
name
:
guessName
(
arg
);
String
varName
=
name
!=
null
?
name
:
guessName
(
arg
);
if
(
NameMapper
.
isReserved
(
varName
))
{
if
(
NameMapper
.
isReserved
(
varName
))
{
return
varName
+
"R"
;
return
varName
+
'R'
;
}
}
return
varName
;
return
varName
;
}
}
...
...
jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
View file @
11cee083
...
@@ -128,7 +128,7 @@ public class TypeGen {
...
@@ -128,7 +128,7 @@ public class TypeGen {
}
}
String
str
=
Long
.
toString
(
l
);
String
str
=
Long
.
toString
(
l
);
if
(
Math
.
abs
(
l
)
>=
Integer
.
MAX_VALUE
)
{
if
(
Math
.
abs
(
l
)
>=
Integer
.
MAX_VALUE
)
{
str
+=
"L"
;
str
+=
'L'
;
}
}
return
str
;
return
str
;
}
}
...
@@ -152,7 +152,7 @@ public class TypeGen {
...
@@ -152,7 +152,7 @@ public class TypeGen {
if
(
d
==
Double
.
MIN_NORMAL
)
{
if
(
d
==
Double
.
MIN_NORMAL
)
{
return
"Double.MIN_NORMAL"
;
return
"Double.MIN_NORMAL"
;
}
}
return
Double
.
toString
(
d
)
+
"d"
;
return
Double
.
toString
(
d
)
+
'd'
;
}
}
public
static
String
formatFloat
(
float
f
)
{
public
static
String
formatFloat
(
float
f
)
{
...
@@ -174,6 +174,6 @@ public class TypeGen {
...
@@ -174,6 +174,6 @@ public class TypeGen {
if
(
f
==
Float
.
MIN_NORMAL
)
{
if
(
f
==
Float
.
MIN_NORMAL
)
{
return
"Float.MIN_NORMAL"
;
return
"Float.MIN_NORMAL"
;
}
}
return
Float
.
toString
(
f
)
+
"f"
;
return
Float
.
toString
(
f
)
+
'f'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
View file @
11cee083
...
@@ -394,7 +394,7 @@ public class Deobfuscator {
...
@@ -394,7 +394,7 @@ public class Deobfuscator {
return
null
;
return
null
;
}
}
}
}
ClassNode
otherCls
=
cls
.
dex
().
root
().
searchClassByName
(
cls
.
getPackage
()
+
"."
+
name
);
ClassNode
otherCls
=
cls
.
dex
().
root
().
searchClassByName
(
cls
.
getPackage
()
+
'.'
+
name
);
if
(
otherCls
!=
null
)
{
if
(
otherCls
!=
null
)
{
return
null
;
return
null
;
}
}
...
@@ -484,7 +484,7 @@ public class Deobfuscator {
...
@@ -484,7 +484,7 @@ public class Deobfuscator {
private
String
prepareNamePart
(
String
name
)
{
private
String
prepareNamePart
(
String
name
)
{
if
(
name
.
length
()
>
maxLength
)
{
if
(
name
.
length
()
>
maxLength
)
{
return
"x"
+
Integer
.
toHexString
(
name
.
hashCode
());
return
'x'
+
Integer
.
toHexString
(
name
.
hashCode
());
}
}
return
NameMapper
.
removeInvalidCharsMiddle
(
name
);
return
NameMapper
.
removeInvalidCharsMiddle
(
name
);
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java
View file @
11cee083
...
@@ -121,6 +121,6 @@ public class AttributeStorage {
...
@@ -121,6 +121,6 @@ public class AttributeStorage {
if
(
list
.
isEmpty
())
{
if
(
list
.
isEmpty
())
{
return
""
;
return
""
;
}
}
return
"A:{"
+
Utils
.
listToString
(
list
)
+
"}"
;
return
"A:{"
+
Utils
.
listToString
(
list
)
+
'}'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/attributes/annotations/Annotation.java
View file @
11cee083
...
@@ -42,6 +42,6 @@ public class Annotation {
...
@@ -42,6 +42,6 @@ public class Annotation {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"Annotation["
+
visibility
+
", "
+
atype
+
", "
+
values
+
"]"
;
return
"Annotation["
+
visibility
+
", "
+
atype
+
", "
+
values
+
']'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java
View file @
11cee083
...
@@ -43,6 +43,6 @@ public class EdgeInsnAttr implements IAttribute {
...
@@ -43,6 +43,6 @@ public class EdgeInsnAttr implements IAttribute {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"EDGE_INSN: "
+
start
+
"->"
+
end
+
" "
+
insn
;
return
"EDGE_INSN: "
+
start
+
"->"
+
end
+
' '
+
insn
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java
View file @
11cee083
...
@@ -44,6 +44,6 @@ public class FieldReplaceAttr implements IAttribute {
...
@@ -44,6 +44,6 @@ public class FieldReplaceAttr implements IAttribute {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"REPLACE: "
+
replaceType
+
" "
+
replaceObj
;
return
"REPLACE: "
+
replaceType
+
' '
+
replaceObj
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java
View file @
11cee083
...
@@ -34,7 +34,7 @@ public class JadxError {
...
@@ -34,7 +34,7 @@ public class JadxError {
}
}
if
(
cause
!=
null
)
{
if
(
cause
!=
null
)
{
str
.
append
(
cause
.
getClass
());
str
.
append
(
cause
.
getClass
());
str
.
append
(
":"
);
str
.
append
(
':'
);
str
.
append
(
cause
.
getMessage
());
str
.
append
(
cause
.
getMessage
());
str
.
append
(
"\n"
);
str
.
append
(
"\n"
);
str
.
append
(
Utils
.
getStackTrace
(
cause
));
str
.
append
(
Utils
.
getStackTrace
(
cause
));
...
...
jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
View file @
11cee083
...
@@ -25,7 +25,7 @@ public class PhiListAttr implements IAttribute {
...
@@ -25,7 +25,7 @@ public class PhiListAttr implements IAttribute {
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
"PHI: "
);
sb
.
append
(
"PHI: "
);
for
(
PhiInsn
phiInsn
:
list
)
{
for
(
PhiInsn
phiInsn
:
list
)
{
sb
.
append
(
'r'
).
append
(
phiInsn
.
getResult
().
getRegNum
()).
append
(
" "
);
sb
.
append
(
'r'
).
append
(
phiInsn
.
getResult
().
getRegNum
()).
append
(
' '
);
}
}
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java
View file @
11cee083
...
@@ -203,6 +203,6 @@ public class AccessInfo {
...
@@ -203,6 +203,6 @@ public class AccessInfo {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"AccessInfo: "
+
type
+
" 0x"
+
Integer
.
toHexString
(
accFlags
)
+
" ("
+
rawString
()
+
")"
;
return
"AccessInfo: "
+
type
+
" 0x"
+
Integer
.
toHexString
(
accFlags
)
+
" ("
+
rawString
()
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java
View file @
11cee083
...
@@ -91,7 +91,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
...
@@ -91,7 +91,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
int
sep
=
clsName
.
lastIndexOf
(
'$'
);
int
sep
=
clsName
.
lastIndexOf
(
'$'
);
if
(
canBeInner
&&
sep
>
0
&&
sep
!=
clsName
.
length
()
-
1
)
{
if
(
canBeInner
&&
sep
>
0
&&
sep
!=
clsName
.
length
()
-
1
)
{
String
parClsName
=
pkg
+
"."
+
clsName
.
substring
(
0
,
sep
);
String
parClsName
=
pkg
+
'.'
+
clsName
.
substring
(
0
,
sep
);
if
(
pkg
.
isEmpty
())
{
if
(
pkg
.
isEmpty
())
{
parClsName
=
clsName
.
substring
(
0
,
sep
);
parClsName
=
clsName
.
substring
(
0
,
sep
);
}
}
...
@@ -110,7 +110,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
...
@@ -110,7 +110,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
String
innerSep
=
raw
?
"$"
:
"."
;
String
innerSep
=
raw
?
"$"
:
"."
;
return
parentClass
.
makeFullClsName
(
parentClass
.
getShortName
(),
raw
)
+
innerSep
+
shortName
;
return
parentClass
.
makeFullClsName
(
parentClass
.
getShortName
(),
raw
)
+
innerSep
+
shortName
;
}
}
return
pkg
.
isEmpty
()
?
shortName
:
pkg
+
"."
+
shortName
;
return
pkg
.
isEmpty
()
?
shortName
:
pkg
+
'.'
+
shortName
;
}
}
public
String
makeRawFullName
()
{
public
String
makeRawFullName
()
{
...
@@ -148,7 +148,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
...
@@ -148,7 +148,7 @@ public final class ClassInfo implements Comparable<ClassInfo> {
if
(
parentClass
==
null
)
{
if
(
parentClass
==
null
)
{
return
name
;
return
name
;
}
}
return
parentClass
.
getNameWithoutPackage
()
+
"."
+
name
;
return
parentClass
.
getNameWithoutPackage
()
+
'.'
+
name
;
}
}
public
ClassInfo
getParentClass
()
{
public
ClassInfo
getParentClass
()
{
...
...
jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java
View file @
11cee083
...
@@ -54,11 +54,11 @@ public final class FieldInfo {
...
@@ -54,11 +54,11 @@ public final class FieldInfo {
}
}
public
String
getFullId
()
{
public
String
getFullId
()
{
return
declClass
.
getFullName
()
+
"."
+
name
+
":"
+
TypeGen
.
signature
(
type
);
return
declClass
.
getFullName
()
+
'.'
+
name
+
':'
+
TypeGen
.
signature
(
type
);
}
}
public
String
getRawFullId
()
{
public
String
getRawFullId
()
{
return
declClass
.
makeRawFullName
()
+
"."
+
name
+
":"
+
TypeGen
.
signature
(
type
);
return
declClass
.
makeRawFullName
()
+
'.'
+
name
+
':'
+
TypeGen
.
signature
(
type
);
}
}
public
boolean
isRenamed
()
{
public
boolean
isRenamed
()
{
...
@@ -93,6 +93,6 @@ public final class FieldInfo {
...
@@ -93,6 +93,6 @@ public final class FieldInfo {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
declClass
+
"."
+
name
+
" "
+
type
;
return
declClass
+
"."
+
name
+
' '
+
type
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java
View file @
11cee083
...
@@ -65,15 +65,15 @@ public final class MethodInfo {
...
@@ -65,15 +65,15 @@ public final class MethodInfo {
}
}
public
String
getFullName
()
{
public
String
getFullName
()
{
return
declClass
.
getFullName
()
+
"."
+
name
;
return
declClass
.
getFullName
()
+
'.'
+
name
;
}
}
public
String
getFullId
()
{
public
String
getFullId
()
{
return
declClass
.
getFullName
()
+
"."
+
shortId
;
return
declClass
.
getFullName
()
+
'.'
+
shortId
;
}
}
public
String
getRawFullId
()
{
public
String
getRawFullId
()
{
return
declClass
.
makeRawFullName
()
+
"."
+
shortId
;
return
declClass
.
makeRawFullName
()
+
'.'
+
shortId
;
}
}
/**
/**
...
@@ -151,7 +151,7 @@ public final class MethodInfo {
...
@@ -151,7 +151,7 @@ public final class MethodInfo {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
declClass
.
getFullName
()
+
"."
+
name
return
declClass
.
getFullName
()
+
'.'
+
name
+
"("
+
Utils
.
listToString
(
args
)
+
"):"
+
retType
;
+
'('
+
Utils
.
listToString
(
args
)
+
"):"
+
retType
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java
View file @
11cee083
...
@@ -76,8 +76,8 @@ public class ArithNode extends InsnNode {
...
@@ -76,8 +76,8 @@ public class ArithNode extends InsnNode {
return
InsnUtils
.
formatOffset
(
offset
)
+
": "
return
InsnUtils
.
formatOffset
(
offset
)
+
": "
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
getResult
()
+
" = "
+
getResult
()
+
" = "
+
getArg
(
0
)
+
" "
+
getArg
(
0
)
+
' '
+
op
.
getSymbol
()
+
" "
+
op
.
getSymbol
()
+
' '
+
getArg
(
1
);
+
getArg
(
1
);
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java
View file @
11cee083
...
@@ -35,6 +35,6 @@ public final class ConstClassNode extends InsnNode {
...
@@ -35,6 +35,6 @@ public final class ConstClassNode extends InsnNode {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
" "
+
clsType
;
return
super
.
toString
()
+
' '
+
clsType
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java
View file @
11cee083
...
@@ -34,6 +34,6 @@ public final class ConstStringNode extends InsnNode {
...
@@ -34,6 +34,6 @@ public final class ConstStringNode extends InsnNode {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
" \""
+
str
+
"\""
;
return
super
.
toString
()
+
" \""
+
str
+
'"'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java
View file @
11cee083
...
@@ -111,7 +111,7 @@ public class IfNode extends GotoNode {
...
@@ -111,7 +111,7 @@ public class IfNode extends GotoNode {
public
String
toString
()
{
public
String
toString
()
{
return
InsnUtils
.
formatOffset
(
offset
)
+
": "
return
InsnUtils
.
formatOffset
(
offset
)
+
": "
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
getArg
(
0
)
+
" "
+
op
.
getSymbol
()
+
" "
+
getArg
(
1
)
+
getArg
(
0
)
+
' '
+
op
.
getSymbol
()
+
' '
+
getArg
(
1
)
+
" -> "
+
(
thenBlock
!=
null
?
thenBlock
:
InsnUtils
.
formatOffset
(
target
));
+
" -> "
+
(
thenBlock
!=
null
?
thenBlock
:
InsnUtils
.
formatOffset
(
target
));
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java
View file @
11cee083
...
@@ -35,6 +35,6 @@ public class IndexInsnNode extends InsnNode {
...
@@ -35,6 +35,6 @@ public class IndexInsnNode extends InsnNode {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
" "
+
InsnUtils
.
indexToString
(
index
);
return
super
.
toString
()
+
' '
+
InsnUtils
.
indexToString
(
index
);
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
View file @
11cee083
...
@@ -578,7 +578,7 @@ public class InsnDecoder {
...
@@ -578,7 +578,7 @@ public class InsnDecoder {
InsnArg
.
reg
(
insn
,
0
,
ArgType
.
UNKNOWN_OBJECT
));
InsnArg
.
reg
(
insn
,
0
,
ArgType
.
UNKNOWN_OBJECT
));
default
:
default
:
throw
new
DecodeException
(
"Unknown instruction: '"
+
OpcodeInfo
.
getName
(
insn
.
getOpcode
())
+
"'"
);
throw
new
DecodeException
(
"Unknown instruction: '"
+
OpcodeInfo
.
getName
(
insn
.
getOpcode
())
+
'\''
);
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java
View file @
11cee083
...
@@ -73,7 +73,7 @@ public class InvokeNode extends InsnNode implements CallMthInterface {
...
@@ -73,7 +73,7 @@ public class InvokeNode extends InsnNode implements CallMthInterface {
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
InsnUtils
.
insnTypeToString
(
insnType
)
+
(
getResult
()
==
null
?
""
:
getResult
()
+
" = "
)
+
(
getResult
()
==
null
?
""
:
getResult
()
+
" = "
)
+
Utils
.
listToString
(
getArguments
())
+
Utils
.
listToString
(
getArguments
())
+
" "
+
mth
+
' '
+
mth
+
" type: "
+
type
;
+
" type: "
+
type
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
View file @
11cee083
...
@@ -229,7 +229,7 @@ public abstract class ArgType {
...
@@ -229,7 +229,7 @@ public abstract class ArgType {
if
(
bounds
==
0
)
{
if
(
bounds
==
0
)
{
return
"?"
;
return
"?"
;
}
}
return
"? "
+
(
bounds
==
-
1
?
"super"
:
"extends"
)
+
" "
+
type
;
return
"? "
+
(
bounds
==
-
1
?
"super"
:
"extends"
)
+
' '
+
type
;
}
}
}
}
...
@@ -245,7 +245,7 @@ public abstract class ArgType {
...
@@ -245,7 +245,7 @@ public abstract class ArgType {
}
}
public
GenericObject
(
GenericObject
outerType
,
String
innerName
,
ArgType
[]
generics
)
{
public
GenericObject
(
GenericObject
outerType
,
String
innerName
,
ArgType
[]
generics
)
{
super
(
outerType
.
getObject
()
+
"$"
+
innerName
);
super
(
outerType
.
getObject
()
+
'$'
+
innerName
);
this
.
outerType
=
outerType
;
this
.
outerType
=
outerType
;
this
.
generics
=
generics
;
this
.
generics
=
generics
;
this
.
hash
=
outerType
.
hashCode
()
+
31
*
innerName
.
hashCode
()
this
.
hash
=
outerType
.
hashCode
()
+
31
*
innerName
.
hashCode
()
...
@@ -275,7 +275,7 @@ public abstract class ArgType {
...
@@ -275,7 +275,7 @@ public abstract class ArgType {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
"<"
+
Utils
.
arrayToString
(
generics
)
+
">"
;
return
super
.
toString
()
+
'<'
+
Utils
.
arrayToString
(
generics
)
+
'>'
;
}
}
}
}
...
@@ -389,7 +389,7 @@ public abstract class ArgType {
...
@@ -389,7 +389,7 @@ public abstract class ArgType {
if
(
possibleTypes
.
length
==
PrimitiveType
.
values
().
length
)
{
if
(
possibleTypes
.
length
==
PrimitiveType
.
values
().
length
)
{
return
"?"
;
return
"?"
;
}
else
{
}
else
{
return
"?"
+
Arrays
.
toString
(
possibleTypes
);
return
'?'
+
Arrays
.
toString
(
possibleTypes
);
}
}
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/args/FieldArg.java
View file @
11cee083
...
@@ -70,6 +70,6 @@ public final class FieldArg extends RegisterArg {
...
@@ -70,6 +70,6 @@ public final class FieldArg extends RegisterArg {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"("
+
field
+
")"
;
return
"("
+
field
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java
View file @
11cee083
...
@@ -62,6 +62,6 @@ public final class InsnWrapArg extends InsnArg {
...
@@ -62,6 +62,6 @@ public final class InsnWrapArg extends InsnArg {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"(wrap: "
+
type
+
"\n "
+
wrappedInsn
+
")"
;
return
"(wrap: "
+
type
+
"\n "
+
wrappedInsn
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java
View file @
11cee083
...
@@ -69,10 +69,10 @@ public final class LiteralArg extends InsnArg {
...
@@ -69,10 +69,10 @@ public final class LiteralArg extends InsnArg {
if
(
getType
().
equals
(
ArgType
.
BOOLEAN
)
&&
(
value
.
equals
(
"true"
)
||
value
.
equals
(
"false"
)))
{
if
(
getType
().
equals
(
ArgType
.
BOOLEAN
)
&&
(
value
.
equals
(
"true"
)
||
value
.
equals
(
"false"
)))
{
return
value
;
return
value
;
}
}
return
"("
+
value
+
" "
+
type
+
")"
;
return
'('
+
value
+
' '
+
type
+
')'
;
}
catch
(
JadxRuntimeException
ex
)
{
}
catch
(
JadxRuntimeException
ex
)
{
// can't convert literal to string
// can't convert literal to string
return
"("
+
literal
+
" "
+
type
+
")"
;
return
"("
+
literal
+
' '
+
type
+
')'
;
}
}
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java
View file @
11cee083
...
@@ -44,6 +44,6 @@ public final class NamedArg extends InsnArg implements Named {
...
@@ -44,6 +44,6 @@ public final class NamedArg extends InsnArg implements Named {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"("
+
name
+
" "
+
type
+
")"
;
return
'('
+
name
+
' '
+
type
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
View file @
11cee083
...
@@ -169,17 +169,17 @@ public class RegisterArg extends InsnArg implements Named {
...
@@ -169,17 +169,17 @@ public class RegisterArg extends InsnArg implements Named {
sb
.
append
(
"(r"
);
sb
.
append
(
"(r"
);
sb
.
append
(
regNum
);
sb
.
append
(
regNum
);
if
(
sVar
!=
null
)
{
if
(
sVar
!=
null
)
{
sb
.
append
(
"_"
).
append
(
sVar
.
getVersion
());
sb
.
append
(
'_'
).
append
(
sVar
.
getVersion
());
}
}
if
(
getName
()
!=
null
)
{
if
(
getName
()
!=
null
)
{
sb
.
append
(
" '"
).
append
(
getName
()).
append
(
"'"
);
sb
.
append
(
" '"
).
append
(
getName
()).
append
(
'\''
);
}
}
sb
.
append
(
" "
);
sb
.
append
(
' '
);
sb
.
append
(
type
);
sb
.
append
(
type
);
if
(!
isAttrStorageEmpty
())
{
if
(!
isAttrStorageEmpty
())
{
sb
.
append
(
' '
).
append
(
getAttributesString
());
sb
.
append
(
' '
).
append
(
getAttributesString
());
}
}
sb
.
append
(
")"
);
sb
.
append
(
')'
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
View file @
11cee083
...
@@ -206,6 +206,6 @@ public class SSAVar extends AttrNode {
...
@@ -206,6 +206,6 @@ public class SSAVar extends AttrNode {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"r"
+
regNum
+
"_"
+
version
;
return
"r"
+
regNum
+
'_'
+
version
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
View file @
11cee083
...
@@ -107,6 +107,6 @@ public class ConstructorInsn extends InsnNode implements CallMthInterface {
...
@@ -107,6 +107,6 @@ public class ConstructorInsn extends InsnNode implements CallMthInterface {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
" "
+
callMth
+
" "
+
callType
;
return
super
.
toString
()
+
' '
+
callMth
+
' '
+
callType
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
View file @
11cee083
...
@@ -192,6 +192,6 @@ public class BlockNode extends AttrNode implements IBlock {
...
@@ -192,6 +192,6 @@ public class BlockNode extends AttrNode implements IBlock {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"B:"
+
id
+
":"
+
InsnUtils
.
formatOffset
(
startOffset
);
return
"B:"
+
id
+
':'
+
InsnUtils
.
formatOffset
(
startOffset
);
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
View file @
11cee083
...
@@ -668,7 +668,7 @@ public class MethodNode extends LineAttrNode implements ILoadable, ICodeNode {
...
@@ -668,7 +668,7 @@ public class MethodNode extends LineAttrNode implements ILoadable, ICodeNode {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
parentClass
+
"."
+
mthInfo
.
getName
()
return
parentClass
+
"."
+
mthInfo
.
getName
()
+
"("
+
Utils
.
listToString
(
mthInfo
.
getArgumentsTypes
())
+
"):"
+
'('
+
Utils
.
listToString
(
mthInfo
.
getArgumentsTypes
())
+
"):"
+
retType
;
+
retType
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java
View file @
11cee083
...
@@ -119,8 +119,8 @@ final class LocalVar {
...
@@ -119,8 +119,8 @@ final class LocalVar {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
super
.
toString
()
+
" "
+
(
isEnd
return
super
.
toString
()
+
' '
+
(
isEnd
?
"end: "
+
InsnUtils
.
formatOffset
(
startAddr
)
+
"-"
+
InsnUtils
.
formatOffset
(
endAddr
)
?
"end: "
+
InsnUtils
.
formatOffset
(
startAddr
)
+
'-'
+
InsnUtils
.
formatOffset
(
endAddr
)
:
"active: "
+
InsnUtils
.
formatOffset
(
startAddr
));
:
"active: "
+
InsnUtils
.
formatOffset
(
startAddr
));
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
View file @
11cee083
...
@@ -169,7 +169,7 @@ public class SignatureParser {
...
@@ -169,7 +169,7 @@ public class SignatureParser {
// generic type start ('<')
// generic type start ('<')
String
obj
=
slice
();
String
obj
=
slice
();
if
(!
incompleteType
)
{
if
(!
incompleteType
)
{
obj
+=
";"
;
obj
+=
';'
;
}
}
ArgType
[]
genArr
=
consumeGenericArgs
();
ArgType
[]
genArr
=
consumeGenericArgs
();
consume
(
'>'
);
consume
(
'>'
);
...
...
jadx-core/src/main/java/jadx/core/dex/regions/Region.java
View file @
11cee083
...
@@ -53,6 +53,6 @@ public final class Region extends AbstractRegion {
...
@@ -53,6 +53,6 @@ public final class Region extends AbstractRegion {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"R"
+
baseString
();
return
'R'
+
baseString
();
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/regions/conditions/Compare.java
View file @
11cee083
...
@@ -44,6 +44,6 @@ public final class Compare {
...
@@ -44,6 +44,6 @@ public final class Compare {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
getA
()
+
" "
+
getOp
().
getSymbol
()
+
" "
+
getB
();
return
getA
()
+
" "
+
getOp
().
getSymbol
()
+
' '
+
getB
();
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
View file @
11cee083
...
@@ -224,7 +224,7 @@ public final class IfCondition {
...
@@ -224,7 +224,7 @@ public final class IfCondition {
case
TERNARY:
case
TERNARY:
return
first
()
+
" ? "
+
second
()
+
" : "
+
third
();
return
first
()
+
" ? "
+
second
()
+
" : "
+
third
();
case
NOT:
case
NOT:
return
"!("
+
first
()
+
")"
;
return
"!("
+
first
()
+
')'
;
case
AND:
case
AND:
case
OR:
case
OR:
String
op
=
mode
==
Mode
.
OR
?
" || "
:
" && "
;
String
op
=
mode
==
Mode
.
OR
?
" || "
:
" && "
;
...
...
jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java
View file @
11cee083
...
@@ -130,6 +130,6 @@ public final class IfRegion extends AbstractRegion implements IBranchRegion {
...
@@ -130,6 +130,6 @@ public final class IfRegion extends AbstractRegion implements IBranchRegion {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"IF "
+
header
+
" then ("
+
thenRegion
+
") else ("
+
elseRegion
+
")"
;
return
"IF "
+
header
+
" then ("
+
thenRegion
+
") else ("
+
elseRegion
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java
View file @
11cee083
...
@@ -30,6 +30,6 @@ public class ExcHandlerAttr implements IAttribute {
...
@@ -30,6 +30,6 @@ public class ExcHandlerAttr implements IAttribute {
public
String
toString
()
{
public
String
toString
()
{
return
"ExcHandler: "
+
(
handler
.
isFinally
()
return
"ExcHandler: "
+
(
handler
.
isFinally
()
?
" FINALLY"
?
" FINALLY"
:
handler
.
catchTypeStr
()
+
" "
+
handler
.
getArg
());
:
handler
.
catchTypeStr
()
+
' '
+
handler
.
getArg
());
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
View file @
11cee083
...
@@ -162,8 +162,8 @@ public class CodeShrinker extends AbstractVisitor {
...
@@ -162,8 +162,8 @@ public class CodeShrinker extends AbstractVisitor {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"ArgsInfo: |"
+
inlineBorder
return
"ArgsInfo: |"
+
inlineBorder
+
" ->"
+
(
inlinedInsn
==
null
?
"-"
:
inlinedInsn
.
pos
)
+
" ->"
+
(
inlinedInsn
==
null
?
'-'
:
inlinedInsn
.
pos
)
+
" "
+
args
+
" : "
+
insn
;
+
' '
+
args
+
" : "
+
insn
;
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
View file @
11cee083
...
@@ -241,9 +241,9 @@ public class DotGraphVisitor extends AbstractVisitor {
...
@@ -241,9 +241,9 @@ public class DotGraphVisitor extends AbstractVisitor {
if
(
c
instanceof
BlockNode
)
{
if
(
c
instanceof
BlockNode
)
{
name
=
"Node_"
+
((
BlockNode
)
c
).
getId
();
name
=
"Node_"
+
((
BlockNode
)
c
).
getId
();
}
else
if
(
c
instanceof
IBlock
)
{
}
else
if
(
c
instanceof
IBlock
)
{
name
=
"Node_"
+
c
.
getClass
().
getSimpleName
()
+
"_"
+
c
.
hashCode
();
name
=
"Node_"
+
c
.
getClass
().
getSimpleName
()
+
'_'
+
c
.
hashCode
();
}
else
{
}
else
{
name
=
"cluster_"
+
c
.
getClass
().
getSimpleName
()
+
"_"
+
c
.
hashCode
();
name
=
"cluster_"
+
c
.
getClass
().
getSimpleName
()
+
'_'
+
c
.
hashCode
();
}
}
return
name
;
return
name
;
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
View file @
11cee083
...
@@ -473,7 +473,7 @@ public class ModVisitor extends AbstractVisitor {
...
@@ -473,7 +473,7 @@ public class ModVisitor extends AbstractVisitor {
for
(
RegisterArg
arg
:
mth
.
getArguments
(
false
))
{
for
(
RegisterArg
arg
:
mth
.
getArguments
(
false
))
{
String
name
=
arg
.
getName
();
String
name
=
arg
.
getName
();
if
(
name
!=
null
&&
NameMapper
.
isReserved
(
name
))
{
if
(
name
!=
null
&&
NameMapper
.
isReserved
(
name
))
{
name
=
name
+
"_"
;
name
=
name
+
'_'
;
arg
.
getSVar
().
setName
(
name
);
arg
.
getSVar
().
setName
(
name
);
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/RenameVisitor.java
View file @
11cee083
...
@@ -79,7 +79,7 @@ public class RenameVisitor extends AbstractVisitor {
...
@@ -79,7 +79,7 @@ public class RenameVisitor extends AbstractVisitor {
}
}
if
(
alias
.
getPackage
().
isEmpty
())
{
if
(
alias
.
getPackage
().
isEmpty
())
{
String
fullName
=
alias
.
makeFullClsName
(
alias
.
getShortName
(),
true
);
String
fullName
=
alias
.
makeFullClsName
(
alias
.
getShortName
(),
true
);
String
newFullName
=
Consts
.
DEFAULT_PACKAGE_NAME
+
"."
+
fullName
;
String
newFullName
=
Consts
.
DEFAULT_PACKAGE_NAME
+
'.'
+
fullName
;
classInfo
.
rename
(
cls
.
root
(),
newFullName
);
classInfo
.
rename
(
cls
.
root
(),
newFullName
);
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksPair.java
View file @
11cee083
...
@@ -38,6 +38,6 @@ public final class BlocksPair {
...
@@ -38,6 +38,6 @@ public final class BlocksPair {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"("
+
first
+
", "
+
second
+
")"
;
return
"("
+
first
+
", "
+
second
+
')'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
View file @
11cee083
...
@@ -116,7 +116,7 @@ public final class BlocksRemoveInfo {
...
@@ -116,7 +116,7 @@ public final class BlocksRemoveInfo {
+
", processed: "
+
processed
+
", processed: "
+
processed
+
", outs: "
+
outs
+
", outs: "
+
outs
+
", regMap: "
+
regMap
+
", regMap: "
+
regMap
+
", split: "
+
startSplitIndex
+
"-"
+
endSplitIndex
+
", split: "
+
startSplitIndex
+
'-'
+
endSplitIndex
+
"}"
;
+
'}'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessVariables.java
View file @
11cee083
...
@@ -58,7 +58,7 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -58,7 +58,7 @@ public class ProcessVariables extends AbstractVisitor {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"r"
+
regNum
+
":"
+
type
;
return
"r"
+
regNum
+
':'
+
type
;
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
View file @
11cee083
...
@@ -76,7 +76,7 @@ public class RegionMaker {
...
@@ -76,7 +76,7 @@ public class RegionMaker {
int
startBlockId
=
startBlock
.
getId
();
int
startBlockId
=
startBlock
.
getId
();
if
(
processedBlocks
.
get
(
startBlockId
))
{
if
(
processedBlocks
.
get
(
startBlockId
))
{
mth
.
addWarn
(
"Removed duplicated region for block: "
+
startBlock
+
" "
+
startBlock
.
getAttributesString
());
mth
.
addWarn
(
"Removed duplicated region for block: "
+
startBlock
+
' '
+
startBlock
.
getAttributesString
());
return
r
;
return
r
;
}
}
processedBlocks
.
set
(
startBlockId
);
processedBlocks
.
set
(
startBlockId
);
...
...
jadx-core/src/main/java/jadx/core/utils/InsnUtils.java
View file @
11cee083
...
@@ -57,7 +57,7 @@ public class InsnUtils {
...
@@ -57,7 +57,7 @@ public class InsnUtils {
return
""
;
return
""
;
}
}
if
(
index
instanceof
String
)
{
if
(
index
instanceof
String
)
{
return
"\""
+
index
+
"\""
;
return
"\""
+
index
+
'"'
;
}
}
return
index
.
toString
();
return
index
.
toString
();
}
}
...
...
jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java
View file @
11cee083
...
@@ -133,7 +133,7 @@ public class AndroidResourcesUtils {
...
@@ -133,7 +133,7 @@ public class AndroidResourcesUtils {
@NotNull
@NotNull
private
static
ClassNode
addClassForResType
(
ClassNode
resCls
,
boolean
rClsExists
,
String
typeName
)
{
private
static
ClassNode
addClassForResType
(
ClassNode
resCls
,
boolean
rClsExists
,
String
typeName
)
{
ClassNode
newTypeCls
=
new
ClassNode
(
resCls
.
dex
(),
resCls
.
getFullName
()
+
"$"
+
typeName
,
ClassNode
newTypeCls
=
new
ClassNode
(
resCls
.
dex
(),
resCls
.
getFullName
()
+
'$'
+
typeName
,
AccessFlags
.
ACC_PUBLIC
|
AccessFlags
.
ACC_STATIC
|
AccessFlags
.
ACC_FINAL
);
AccessFlags
.
ACC_PUBLIC
|
AccessFlags
.
ACC_STATIC
|
AccessFlags
.
ACC_FINAL
);
resCls
.
addInnerClass
(
newTypeCls
);
resCls
.
addInnerClass
(
newTypeCls
);
if
(
rClsExists
)
{
if
(
rClsExists
)
{
...
...
jadx-core/src/main/java/jadx/core/utils/files/DexFile.java
View file @
11cee083
...
@@ -27,6 +27,6 @@ public class DexFile {
...
@@ -27,6 +27,6 @@ public class DexFile {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
inputFile
+
(
name
.
isEmpty
()
?
""
:
":"
+
name
);
return
inputFile
+
(
name
.
isEmpty
()
?
""
:
':'
+
name
);
}
}
}
}
jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
View file @
11cee083
...
@@ -67,7 +67,7 @@ public class FileUtils {
...
@@ -67,7 +67,7 @@ public class FileUtils {
public
static
File
createTempFile
(
String
suffix
)
{
public
static
File
createTempFile
(
String
suffix
)
{
File
temp
;
File
temp
;
try
{
try
{
temp
=
File
.
createTempFile
(
"jadx-tmp-"
,
System
.
nanoTime
()
+
"-"
+
suffix
);
temp
=
File
.
createTempFile
(
"jadx-tmp-"
,
System
.
nanoTime
()
+
'-'
+
suffix
);
temp
.
deleteOnExit
();
temp
.
deleteOnExit
();
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
throw
new
JadxRuntimeException
(
"Failed to create temp file with suffix: "
+
suffix
);
throw
new
JadxRuntimeException
(
"Failed to create temp file with suffix: "
+
suffix
);
...
@@ -77,7 +77,7 @@ public class FileUtils {
...
@@ -77,7 +77,7 @@ public class FileUtils {
public
static
File
createTempDir
(
String
suffix
)
{
public
static
File
createTempDir
(
String
suffix
)
{
try
{
try
{
Path
path
=
Files
.
createTempDirectory
(
"jadx-tmp-"
+
System
.
nanoTime
()
+
"-"
+
suffix
);
Path
path
=
Files
.
createTempDirectory
(
"jadx-tmp-"
+
System
.
nanoTime
()
+
'-'
+
suffix
);
path
.
toFile
().
deleteOnExit
();
path
.
toFile
().
deleteOnExit
();
return
path
.
toFile
();
return
path
.
toFile
();
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
View file @
11cee083
...
@@ -209,7 +209,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -209,7 +209,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
String
str
=
getString
(
strIndex
);
String
str
=
getString
(
strIndex
);
if
(!
isLastEnd
)
{
if
(!
isLastEnd
)
{
isLastEnd
=
true
;
isLastEnd
=
true
;
writer
.
add
(
">"
);
writer
.
add
(
'>'
);
}
}
writer
.
attachSourceLine
(
lineNumber
);
writer
.
attachSourceLine
(
lineNumber
);
String
escapedStr
=
StringUtils
.
escapeXML
(
str
);
String
escapedStr
=
StringUtils
.
escapeXML
(
str
);
...
@@ -235,13 +235,13 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -235,13 +235,13 @@ public class BinaryXMLParser extends CommonBinaryParser {
int
startNS
=
is
.
readInt32
();
int
startNS
=
is
.
readInt32
();
int
startNSName
=
is
.
readInt32
();
// actually is elementName...
int
startNSName
=
is
.
readInt32
();
// actually is elementName...
if
(!
isLastEnd
&&
!
"ERROR"
.
equals
(
currentTag
))
{
if
(!
isLastEnd
&&
!
"ERROR"
.
equals
(
currentTag
))
{
writer
.
add
(
">"
);
writer
.
add
(
'>'
);
}
}
isOneLine
=
true
;
isOneLine
=
true
;
isLastEnd
=
false
;
isLastEnd
=
false
;
currentTag
=
deobfClassName
(
getString
(
startNSName
));
currentTag
=
deobfClassName
(
getString
(
startNSName
));
currentTag
=
getValidTagAttributeName
(
currentTag
);
currentTag
=
getValidTagAttributeName
(
currentTag
);
writer
.
startLine
(
"<"
).
add
(
currentTag
);
writer
.
startLine
(
'<'
).
add
(
currentTag
);
writer
.
attachSourceLine
(
elementBegLineNumber
);
writer
.
attachSourceLine
(
elementBegLineNumber
);
int
attributeStart
=
is
.
readInt16
();
int
attributeStart
=
is
.
readInt16
();
if
(
attributeStart
!=
0x14
)
{
if
(
attributeStart
!=
0x14
)
{
...
@@ -263,7 +263,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -263,7 +263,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
writer
.
add
(
':'
);
writer
.
add
(
':'
);
writer
.
add
(
nsValue
);
writer
.
add
(
nsValue
);
}
}
writer
.
add
(
"=\""
).
add
(
StringUtils
.
escapeXML
(
entry
.
getKey
())).
add
(
"\""
);
writer
.
add
(
"=\""
).
add
(
StringUtils
.
escapeXML
(
entry
.
getKey
())).
add
(
'"'
);
}
}
}
}
boolean
attrNewLine
=
attributeCount
!=
1
&&
ATTR_NEW_LINE
;
boolean
attrNewLine
=
attributeCount
!=
1
&&
ATTR_NEW_LINE
;
...
@@ -373,13 +373,13 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -373,13 +373,13 @@ public class BinaryXMLParser extends CommonBinaryParser {
// reference custom processing
// reference custom processing
String
name
=
styleMap
.
get
(
attrValData
);
String
name
=
styleMap
.
get
(
attrValData
);
if
(
name
!=
null
)
{
if
(
name
!=
null
)
{
writer
.
add
(
"@style/"
).
add
(
name
.
replace
All
(
"_"
,
"."
));
writer
.
add
(
"@style/"
).
add
(
name
.
replace
(
'_'
,
'.'
));
}
else
{
}
else
{
String
resName
=
resNames
.
get
(
attrValData
);
String
resName
=
resNames
.
get
(
attrValData
);
if
(
resName
!=
null
)
{
if
(
resName
!=
null
)
{
writer
.
add
(
"@"
);
writer
.
add
(
'@'
);
if
(
resName
.
startsWith
(
"id/"
))
{
if
(
resName
.
startsWith
(
"id/"
))
{
writer
.
add
(
"+"
);
writer
.
add
(
'+'
);
}
}
writer
.
add
(
resName
);
writer
.
add
(
resName
);
}
else
{
}
else
{
...
@@ -424,7 +424,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -424,7 +424,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
// if (elementNS != -1) {
// if (elementNS != -1) {
// writer.add(getString(elementNS)).add(':');
// writer.add(getString(elementNS)).add(':');
// }
// }
writer
.
add
(
elemName
).
add
(
">"
);
writer
.
add
(
elemName
).
add
(
'>'
);
}
}
isLastEnd
=
true
;
isLastEnd
=
true
;
if
(
writer
.
getIndent
()
!=
0
)
{
if
(
writer
.
getIndent
()
!=
0
)
{
...
@@ -470,7 +470,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -470,7 +470,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
private
boolean
isDeobfCandidateAttr
(
String
shortNsName
,
String
attrName
)
{
private
boolean
isDeobfCandidateAttr
(
String
shortNsName
,
String
attrName
)
{
String
fullName
;
String
fullName
;
if
(
shortNsName
!=
null
)
{
if
(
shortNsName
!=
null
)
{
fullName
=
shortNsName
+
":"
+
attrName
;
fullName
=
shortNsName
+
':'
+
attrName
;
}
else
{
}
else
{
return
false
;
return
false
;
}
}
...
...
jadx-core/src/main/java/jadx/core/xmlgen/ManifestAttributes.java
View file @
11cee083
...
@@ -43,7 +43,7 @@ public class ManifestAttributes {
...
@@ -43,7 +43,7 @@ public class ManifestAttributes {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"["
+
type
+
", "
+
values
+
"]"
;
return
"["
+
type
+
", "
+
values
+
']'
;
}
}
}
}
...
@@ -173,7 +173,7 @@ public class ManifestAttributes {
...
@@ -173,7 +173,7 @@ public class ManifestAttributes {
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
for
(
Map
.
Entry
<
Long
,
String
>
entry
:
attr
.
getValues
().
entrySet
())
{
for
(
Map
.
Entry
<
Long
,
String
>
entry
:
attr
.
getValues
().
entrySet
())
{
if
(
value
==
entry
.
getKey
())
{
if
(
value
==
entry
.
getKey
())
{
sb
=
new
StringBuilder
(
entry
.
getValue
()
+
"|"
);
sb
=
new
StringBuilder
(
entry
.
getValue
()
+
'|'
);
break
;
break
;
}
else
if
((
value
&
entry
.
getKey
())
==
entry
.
getKey
())
{
}
else
if
((
value
&
entry
.
getKey
())
==
entry
.
getKey
())
{
sb
.
append
(
entry
.
getValue
()).
append
(
'|'
);
sb
.
append
(
entry
.
getValue
()).
append
(
'|'
);
...
...
jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java
View file @
11cee083
...
@@ -49,7 +49,7 @@ public class ResContainer implements Comparable<ResContainer> {
...
@@ -49,7 +49,7 @@ public class ResContainer implements Comparable<ResContainer> {
}
}
public
String
getFileName
()
{
public
String
getFileName
()
{
return
name
.
replace
(
"/"
,
File
.
separato
r
);
return
name
.
replace
(
'/'
,
File
.
separatorCha
r
);
}
}
public
List
<
ResContainer
>
getSubFiles
()
{
public
List
<
ResContainer
>
getSubFiles
()
{
...
@@ -96,6 +96,6 @@ public class ResContainer implements Comparable<ResContainer> {
...
@@ -96,6 +96,6 @@ public class ResContainer implements Comparable<ResContainer> {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"Res{"
+
name
+
", type="
+
dataType
+
", subFiles="
+
subFiles
+
"}"
;
return
"Res{"
+
name
+
", type="
+
dataType
+
", subFiles="
+
subFiles
+
'}'
;
}
}
}
}
jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java
View file @
11cee083
...
@@ -81,7 +81,7 @@ public class ResTableParser extends CommonBinaryParser {
...
@@ -81,7 +81,7 @@ public class ResTableParser extends CommonBinaryParser {
Set
<
String
>
addedValues
=
new
HashSet
<>();
Set
<
String
>
addedValues
=
new
HashSet
<>();
for
(
ResourceEntry
ri
:
resStorage
.
getResources
())
{
for
(
ResourceEntry
ri
:
resStorage
.
getResources
())
{
if
(
addedValues
.
add
(
ri
.
getTypeName
()
+
"."
+
ri
.
getKeyName
()))
{
if
(
addedValues
.
add
(
ri
.
getTypeName
()
+
'.'
+
ri
.
getKeyName
()))
{
String
format
=
String
.
format
(
"<public type=\"%s\" name=\"%s\" id=\"%s\" />"
,
String
format
=
String
.
format
(
"<public type=\"%s\" name=\"%s\" id=\"%s\" />"
,
ri
.
getTypeName
(),
ri
.
getKeyName
(),
ri
.
getId
());
ri
.
getTypeName
(),
ri
.
getKeyName
(),
ri
.
getId
());
writer
.
startLine
(
format
);
writer
.
startLine
(
format
);
...
...
jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
View file @
11cee083
...
@@ -180,9 +180,9 @@ public class ResXmlGen {
...
@@ -180,9 +180,9 @@ public class ResXmlGen {
cw
.
add
(
'<'
).
add
(
itemTag
);
cw
.
add
(
'<'
).
add
(
itemTag
);
if
(
attrName
!=
null
&&
attrValue
!=
null
)
{
if
(
attrName
!=
null
&&
attrValue
!=
null
)
{
if
(
typeName
.
equals
(
"attr"
))
{
if
(
typeName
.
equals
(
"attr"
))
{
cw
.
add
(
' '
).
add
(
"name=\""
).
add
(
attrName
.
replace
(
"id."
,
""
)).
add
(
"\" value=\""
).
add
(
attrValue
).
add
(
"\""
);
cw
.
add
(
' '
).
add
(
"name=\""
).
add
(
attrName
.
replace
(
"id."
,
""
)).
add
(
"\" value=\""
).
add
(
attrValue
).
add
(
'"'
);
}
else
if
(
typeName
.
equals
(
"style"
))
{
}
else
if
(
typeName
.
equals
(
"style"
))
{
cw
.
add
(
' '
).
add
(
"name=\""
).
add
(
attrName
.
replace
(
"attr."
,
""
)).
add
(
"\""
);
cw
.
add
(
' '
).
add
(
"name=\""
).
add
(
attrName
.
replace
(
"attr."
,
""
)).
add
(
'"'
);
}
else
{
}
else
{
cw
.
add
(
' '
).
add
(
attrName
).
add
(
"=\""
).
add
(
attrValue
).
add
(
'"'
);
cw
.
add
(
' '
).
add
(
attrName
).
add
(
"=\""
).
add
(
attrValue
).
add
(
'"'
);
}
}
...
...
jadx-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java
View file @
11cee083
...
@@ -47,7 +47,7 @@ public class ResourceStorage {
...
@@ -47,7 +47,7 @@ public class ResourceStorage {
public
Map
<
Integer
,
String
>
getResourcesNames
()
{
public
Map
<
Integer
,
String
>
getResourcesNames
()
{
Map
<
Integer
,
String
>
map
=
new
HashMap
<>();
Map
<
Integer
,
String
>
map
=
new
HashMap
<>();
for
(
ResourceEntry
entry
:
list
)
{
for
(
ResourceEntry
entry
:
list
)
{
map
.
put
(
entry
.
getId
(),
entry
.
getTypeName
()
+
"/"
+
entry
.
getKeyName
());
map
.
put
(
entry
.
getId
(),
entry
.
getTypeName
()
+
'/'
+
entry
.
getKeyName
());
}
}
return
map
;
return
map
;
}
}
...
...
jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
View file @
11cee083
...
@@ -450,7 +450,7 @@ public class EntryConfig {
...
@@ -450,7 +450,7 @@ public class EntryConfig {
// denies values-xxx, anything else
// denies values-xxx, anything else
if
(
localeVariant
==
null
&&
localeScript
==
null
&&
(
region
[
0
]
!=
'\
00
'
||
language
[
0
]
!=
'\
00
'
)
&&
if
(
localeVariant
==
null
&&
localeScript
==
null
&&
(
region
[
0
]
!=
'\
00
'
||
language
[
0
]
!=
'\
00
'
)
&&
region
.
length
!=
3
)
{
region
.
length
!=
3
)
{
sb
.
append
(
"-"
).
append
(
language
);
sb
.
append
(
'-'
).
append
(
language
);
if
(
region
[
0
]
!=
'\
00
'
)
{
if
(
region
[
0
]
!=
'\
00
'
)
{
sb
.
append
(
"-r"
).
append
(
region
);
sb
.
append
(
"-r"
).
append
(
region
);
}
}
...
@@ -463,13 +463,13 @@ public class EntryConfig {
...
@@ -463,13 +463,13 @@ public class EntryConfig {
sb
.
append
(
language
);
sb
.
append
(
language
);
}
}
if
(
localeScript
!=
null
&&
localeScript
.
length
==
4
)
{
if
(
localeScript
!=
null
&&
localeScript
.
length
==
4
)
{
sb
.
append
(
"+"
).
append
(
localeScript
);
sb
.
append
(
'+'
).
append
(
localeScript
);
}
}
if
((
region
.
length
==
2
||
region
.
length
==
3
)
&&
region
[
0
]
!=
'\
00
'
)
{
if
((
region
.
length
==
2
||
region
.
length
==
3
)
&&
region
[
0
]
!=
'\
00
'
)
{
sb
.
append
(
"+"
).
append
(
region
);
sb
.
append
(
'+'
).
append
(
region
);
}
}
if
(
localeVariant
!=
null
&&
localeVariant
.
length
>=
5
)
{
if
(
localeVariant
!=
null
&&
localeVariant
.
length
>=
5
)
{
sb
.
append
(
"+"
).
append
(
toUpper
(
localeVariant
));
sb
.
append
(
'+'
).
append
(
toUpper
(
localeVariant
));
}
}
}
}
return
sb
.
toString
();
return
sb
.
toString
();
...
...
jadx-core/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java
View file @
11cee083
...
@@ -75,6 +75,6 @@ public final class ResourceEntry {
...
@@ -75,6 +75,6 @@ public final class ResourceEntry {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
" 0x"
+
Integer
.
toHexString
(
id
)
+
" ("
+
id
+
")"
+
config
+
" = "
+
typeName
+
"."
+
keyName
;
return
" 0x"
+
Integer
.
toHexString
(
id
)
+
" ("
+
id
+
')'
+
config
+
" = "
+
typeName
+
'.'
+
keyName
;
}
}
}
}
jadx-core/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java
View file @
11cee083
...
@@ -60,7 +60,7 @@ public class ValuesParser extends ParserConstants {
...
@@ -60,7 +60,7 @@ public class ValuesParser extends ParserConstants {
if
(
nameStr
==
null
)
{
if
(
nameStr
==
null
)
{
strList
.
add
(
valueStr
);
strList
.
add
(
valueStr
);
}
else
{
}
else
{
strList
.
add
(
nameStr
+
"="
+
valueStr
);
strList
.
add
(
nameStr
+
'='
+
valueStr
);
}
}
}
}
return
strList
.
toString
();
return
strList
.
toString
();
...
@@ -110,7 +110,7 @@ public class ValuesParser extends ParserConstants {
...
@@ -110,7 +110,7 @@ public class ValuesParser extends ParserConstants {
}
}
return
"?unknown_ref: "
+
Integer
.
toHexString
(
data
);
return
"?unknown_ref: "
+
Integer
.
toHexString
(
data
);
}
}
return
"@"
+
ri
;
return
'@'
+
ri
;
}
}
case
TYPE_ATTRIBUTE:
{
case
TYPE_ATTRIBUTE:
{
...
@@ -122,7 +122,7 @@ public class ValuesParser extends ParserConstants {
...
@@ -122,7 +122,7 @@ public class ValuesParser extends ParserConstants {
}
}
return
"?unknown_attr_ref: "
+
Integer
.
toHexString
(
data
);
return
"?unknown_attr_ref: "
+
Integer
.
toHexString
(
data
);
}
}
return
"?"
+
ri
;
return
'?'
+
ri
;
}
}
case
TYPE_DIMENSION:
case
TYPE_DIMENSION:
...
@@ -132,7 +132,7 @@ public class ValuesParser extends ParserConstants {
...
@@ -132,7 +132,7 @@ public class ValuesParser extends ParserConstants {
default
:
default
:
LOG
.
warn
(
"Unknown data type: 0x{} {}"
,
Integer
.
toHexString
(
dataType
),
data
);
LOG
.
warn
(
"Unknown data type: 0x{} {}"
,
Integer
.
toHexString
(
dataType
),
data
);
return
" ?0x"
+
Integer
.
toHexString
(
dataType
)
+
" "
+
data
;
return
" ?0x"
+
Integer
.
toHexString
(
dataType
)
+
' '
+
data
;
}
}
}
}
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
View file @
11cee083
...
@@ -211,7 +211,7 @@ public class JadxSettingsWindow extends JDialog {
...
@@ -211,7 +211,7 @@ public class JadxSettingsWindow extends JDialog {
private
String
getFontLabelStr
()
{
private
String
getFontLabelStr
()
{
Font
font
=
settings
.
getFont
();
Font
font
=
settings
.
getFont
();
String
fontStyleName
=
Utils
.
getFontStyleName
(
font
.
getStyle
());
String
fontStyleName
=
Utils
.
getFontStyleName
(
font
.
getStyle
());
return
NLS
.
str
(
"preferences.font"
)
+
": "
+
font
.
getFontName
()
+
" "
+
fontStyleName
+
" "
+
font
.
getSize
();
return
NLS
.
str
(
"preferences.font"
)
+
": "
+
font
.
getFontName
()
+
' '
+
fontStyleName
+
' '
+
font
.
getSize
();
}
}
private
SettingsGroup
makeDecompilationGroup
()
{
private
SettingsGroup
makeDecompilationGroup
()
{
...
...
jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
View file @
11cee083
...
@@ -94,7 +94,7 @@ public class JMethod extends JNode {
...
@@ -94,7 +94,7 @@ public class JMethod extends JNode {
@Override
@Override
public
String
makeLongString
()
{
public
String
makeLongString
()
{
String
name
=
mth
.
getDeclaringClass
().
getFullName
()
+
"."
+
makeBaseString
();
String
name
=
mth
.
getDeclaringClass
().
getFullName
()
+
'.'
+
makeBaseString
();
return
Utils
.
typeFormat
(
name
,
getReturnType
());
return
Utils
.
typeFormat
(
name
,
getReturnType
());
}
}
...
...
jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java
View file @
11cee083
...
@@ -66,7 +66,7 @@ public class JSources extends JNode {
...
@@ -66,7 +66,7 @@ public class JSources extends JNode {
pkg
.
getInnerPackages
().
clear
();
pkg
.
getInnerPackages
().
clear
();
pkg
.
getInnerPackages
().
addAll
(
innerPkg
.
getInnerPackages
());
pkg
.
getInnerPackages
().
addAll
(
innerPkg
.
getInnerPackages
());
pkg
.
getClasses
().
addAll
(
innerPkg
.
getClasses
());
pkg
.
getClasses
().
addAll
(
innerPkg
.
getClasses
());
pkg
.
setName
(
pkg
.
getName
()
+
"."
+
innerPkg
.
getName
());
pkg
.
setName
(
pkg
.
getName
()
+
'.'
+
innerPkg
.
getName
());
innerPkg
.
getInnerPackages
().
clear
();
innerPkg
.
getInnerPackages
().
clear
();
innerPkg
.
getClasses
().
clear
();
innerPkg
.
getClasses
().
clear
();
...
...
jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
View file @
11cee083
...
@@ -44,7 +44,7 @@ class SearchBar extends JToolBar {
...
@@ -44,7 +44,7 @@ class SearchBar extends JToolBar {
public
SearchBar
(
RSyntaxTextArea
textArea
)
{
public
SearchBar
(
RSyntaxTextArea
textArea
)
{
rTextArea
=
textArea
;
rTextArea
=
textArea
;
JLabel
findLabel
=
new
JLabel
(
NLS
.
str
(
"search.find"
)
+
":"
);
JLabel
findLabel
=
new
JLabel
(
NLS
.
str
(
"search.find"
)
+
':'
);
add
(
findLabel
);
add
(
findLabel
);
searchField
=
new
JTextField
(
30
);
searchField
=
new
JTextField
(
30
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment