Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
6ec7f789
J
jadx
项目概览
keyescgm
/
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,发现更多精彩内容 >>
未验证
提交
6ec7f789
编写于
11月 22, 2021
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: restore usage data after class reload (#1281)
上级
31c0afe2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
0 deletion
+37
-0
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
+22
-0
jadx-core/src/main/java/jadx/core/utils/Utils.java
jadx-core/src/main/java/jadx/core/utils/Utils.java
+15
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
浏览文件 @
6ec7f789
...
...
@@ -108,6 +108,10 @@ public class ClassNode extends NotificationAttrNode implements ILoadable, ICodeN
ListConsumer
<
IFieldData
,
FieldNode
>
fieldsConsumer
=
new
ListConsumer
<>(
fld
->
FieldNode
.
build
(
this
,
fld
));
ListConsumer
<
IMethodData
,
MethodNode
>
methodsConsumer
=
new
ListConsumer
<>(
mth
->
MethodNode
.
build
(
this
,
mth
));
cls
.
visitFieldsAndMethods
(
fieldsConsumer
,
methodsConsumer
);
if
(
this
.
fields
!=
null
&&
this
.
methods
!=
null
)
{
// TODO: temporary solution for restore usage info in reloaded methods and fields
restoreUsageData
(
this
.
fields
,
this
.
methods
,
fieldsConsumer
.
getResult
(),
methodsConsumer
.
getResult
());
}
this
.
fields
=
fieldsConsumer
.
getResult
();
this
.
methods
=
methodsConsumer
.
getResult
();
...
...
@@ -124,6 +128,24 @@ public class ClassNode extends NotificationAttrNode implements ILoadable, ICodeN
}
}
private
void
restoreUsageData
(
List
<
FieldNode
>
oldFields
,
List
<
MethodNode
>
oldMethods
,
List
<
FieldNode
>
newFields
,
List
<
MethodNode
>
newMethods
)
{
Map
<
FieldInfo
,
FieldNode
>
oldFieldMap
=
Utils
.
groupBy
(
oldFields
,
FieldNode:
:
getFieldInfo
);
for
(
FieldNode
newField
:
newFields
)
{
FieldNode
oldField
=
oldFieldMap
.
get
(
newField
.
getFieldInfo
());
if
(
oldField
!=
null
)
{
newField
.
setUseIn
(
oldField
.
getUseIn
());
}
}
Map
<
MethodInfo
,
MethodNode
>
oldMethodsMap
=
Utils
.
groupBy
(
oldMethods
,
MethodNode:
:
getMethodInfo
);
for
(
MethodNode
newMethod
:
newMethods
)
{
MethodNode
oldMethod
=
oldMethodsMap
.
get
(
newMethod
.
getMethodInfo
());
if
(
oldMethod
!=
null
)
{
newMethod
.
setUseIn
(
oldMethod
.
getUseIn
());
}
}
}
private
ArgType
checkSuperType
(
IClassData
cls
)
{
String
superType
=
cls
.
getSuperType
();
if
(
superType
==
null
)
{
...
...
jadx-core/src/main/java/jadx/core/utils/Utils.java
浏览文件 @
6ec7f789
...
...
@@ -315,6 +315,21 @@ public class Utils {
return
result
;
}
/**
* Build map from list of values with value to key mapping function
* <br>
* Similar to:
* <br>
* {@code list.stream().collect(Collectors.toMap(mapKey, Function.identity())); }
*/
public
static
<
K
,
V
>
Map
<
K
,
V
>
groupBy
(
List
<
V
>
list
,
Function
<
V
,
K
>
mapKey
)
{
Map
<
K
,
V
>
map
=
new
HashMap
<>(
list
.
size
());
for
(
V
v
:
list
)
{
map
.
put
(
mapKey
.
apply
(
v
),
v
);
}
return
map
;
}
@Nullable
public
static
<
T
>
T
getOne
(
@Nullable
List
<
T
>
list
)
{
if
(
list
==
null
||
list
.
size
()
!=
1
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录