Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
1c6e51f8
J
jadx
项目概览
Quincy379
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1c6e51f8
编写于
12月 13, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: allow to regenerate class code (#791)
上级
ef5da49b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
70 addition
and
14 deletion
+70
-14
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
+20
-10
jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
...-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
+2
-4
jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
...java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
+7
-0
jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java
...st/java/jadx/tests/integration/others/TestClassReGen.java
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
浏览文件 @
1c6e51f8
...
...
@@ -40,7 +40,7 @@ import jadx.core.utils.exceptions.DecodeException;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
import
static
jadx
.
core
.
dex
.
nodes
.
ProcessState
.
LOADED
;
import
static
jadx
.
core
.
dex
.
nodes
.
ProcessState
.
UN
LOADED
;
import
static
jadx
.
core
.
dex
.
nodes
.
ProcessState
.
NOT_
LOADED
;
public
class
ClassNode
extends
LineAttrNode
implements
ILoadable
,
ICodeNode
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ClassNode
.
class
);
...
...
@@ -262,23 +262,33 @@ public class ClassNode extends LineAttrNode implements ILoadable, ICodeNode {
}
}
public
synchronized
ICodeInfo
decompile
()
{
public
ICodeInfo
decompile
()
{
return
decompile
(
true
);
}
public
ICodeInfo
getCode
()
{
return
decompile
(
true
);
}
public
ICodeInfo
reloadCode
()
{
return
decompile
(
false
);
}
private
synchronized
ICodeInfo
decompile
(
boolean
searchInCache
)
{
ICodeCache
codeCache
=
root
().
getCodeCache
();
ClassNode
topParentClass
=
getTopParentClass
();
String
clsRawName
=
topParentClass
.
getRawName
();
ICodeInfo
code
=
codeCache
.
get
(
clsRawName
);
if
(
code
!=
null
)
{
return
code
;
if
(
searchInCache
)
{
ICodeInfo
code
=
codeCache
.
get
(
clsRawName
);
if
(
code
!=
null
)
{
return
code
;
}
}
ICodeInfo
codeInfo
=
ProcessClass
.
generateCode
(
topParentClass
);
codeCache
.
add
(
clsRawName
,
codeInfo
);
return
codeInfo
;
}
public
ICodeInfo
getCode
()
{
return
decompile
();
}
@Override
public
void
load
()
{
for
(
MethodNode
mth
:
getMethods
())
{
...
...
@@ -300,7 +310,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, ICodeNode {
innerClasses
.
forEach
(
ClassNode:
:
unload
);
fields
.
forEach
(
FieldNode:
:
unloadAttributes
);
unloadAttributes
();
setState
(
UN
LOADED
);
setState
(
NOT_
LOADED
);
}
private
void
buildCache
()
{
...
...
jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
浏览文件 @
1c6e51f8
...
...
@@ -4,15 +4,13 @@ public enum ProcessState {
NOT_LOADED
,
LOADED
,
PROCESS_STARTED
,
PROCESS_COMPLETE
,
GENERATED
,
UNLOADED
;
PROCESS_COMPLETE
;
public
boolean
isLoaded
()
{
return
this
!=
NOT_LOADED
;
}
public
boolean
isProcessed
()
{
return
this
==
PROCESS_COMPLETE
||
this
==
GENERATED
||
this
==
UNLOADED
;
return
this
==
PROCESS_COMPLETE
;
}
}
jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
浏览文件 @
1c6e51f8
...
...
@@ -51,4 +51,11 @@ public class JadxCodeAssertions extends AbstractStringAssert<JadxCodeAssertions>
}
return
countString
(
1
,
sb
.
toString
());
}
public
JadxCodeAssertions
print
()
{
System
.
out
.
println
(
"-----------------------------------------------------------"
);
System
.
out
.
println
(
actual
);
System
.
out
.
println
(
"-----------------------------------------------------------"
);
return
this
;
}
}
jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java
0 → 100644
浏览文件 @
1c6e51f8
package
jadx.tests.integration.others
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestClassReGen
extends
IntegrationTest
{
public
static
class
TestCls
{
private
int
intField
=
5
;
public
static
class
A
{
}
public
int
test
()
{
return
0
;
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
assertThat
(
cls
.
getCode
())
.
containsOnlyOnce
(
"private int intField = 5;"
)
.
containsOnlyOnce
(
"public static class A {"
)
.
containsOnlyOnce
(
"public int test() {"
);
cls
.
getInnerClasses
().
get
(
0
).
getClassInfo
().
changeShortName
(
"ARenamed"
);
cls
.
searchMethodByShortName
(
"test"
).
getMethodInfo
().
setAlias
(
"testRenamed"
);
cls
.
searchFieldByName
(
"intField"
).
getFieldInfo
().
setAlias
(
"intFieldRenamed"
);
assertThat
(
cls
.
reloadCode
())
.
print
()
.
containsOnlyOnce
(
"private int intFieldRenamed = 5;"
)
.
containsOnlyOnce
(
"public static class ARenamed {"
)
.
containsOnlyOnce
(
"public int testRenamed() {"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录