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
3b2b5417
Unverified
Commit
3b2b5417
authored
Jun 05, 2018
by
skylot
Committed by
GitHub
Jun 05, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #292 from skylot/xml_bug_fixes
Fixes xml deobfuscation errors
parents
d20cd43a
0a0c4eac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
CodeWriter.java
jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
+0
-7
BinaryXMLParser.java
...-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+4
-3
No files found.
jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
View file @
3b2b5417
...
@@ -119,13 +119,6 @@ public class CodeWriter {
...
@@ -119,13 +119,6 @@ public class CodeWriter {
buf
.
append
(
code
.
buf
);
buf
.
append
(
code
.
buf
);
return
this
;
return
this
;
}
}
public
void
updateContent
(
String
newData
)
{
offset
=
newData
.
length
();
buf
=
new
StringBuilder
(
newData
);
line
=
newData
.
split
(
NL
).
length
+
1
;
code
=
newData
;
}
public
CodeWriter
newLine
()
{
public
CodeWriter
newLine
()
{
addLine
();
addLine
();
...
...
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
View file @
3b2b5417
...
@@ -251,8 +251,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -251,8 +251,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
}
}
isOneLine
=
true
;
isOneLine
=
true
;
isLastEnd
=
false
;
isLastEnd
=
false
;
currentTag
=
getValidTagAttribute
Name
(
getString
(
startNSName
));
currentTag
=
deobfClass
Name
(
getString
(
startNSName
));
currentTag
=
deobfClass
Name
(
currentTag
);
currentTag
=
getValidTagAttribute
Name
(
currentTag
);
writer
.
startLine
(
"<"
).
add
(
currentTag
);
writer
.
startLine
(
"<"
).
add
(
currentTag
);
writer
.
attachSourceLine
(
elementBegLineNumber
);
writer
.
attachSourceLine
(
elementBegLineNumber
);
int
attributeStart
=
is
.
readInt16
();
int
attributeStart
=
is
.
readInt16
();
...
@@ -441,7 +441,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
...
@@ -441,7 +441,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
int
comment
=
is
.
readInt32
();
int
comment
=
is
.
readInt32
();
int
elementNS
=
is
.
readInt32
();
int
elementNS
=
is
.
readInt32
();
int
elementNameId
=
is
.
readInt32
();
int
elementNameId
=
is
.
readInt32
();
String
elemName
=
getValidTagAttributeName
(
getString
(
elementNameId
));
String
elemName
=
deobfClassName
(
getString
(
elementNameId
));
elemName
=
getValidTagAttributeName
(
elemName
);
if
(
currentTag
.
equals
(
elemName
)
&&
isOneLine
&&
!
isLastEnd
)
{
if
(
currentTag
.
equals
(
elemName
)
&&
isOneLine
&&
!
isLastEnd
)
{
writer
.
add
(
"/>"
);
writer
.
add
(
"/>"
);
}
else
{
}
else
{
...
...
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