Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
118fa98c
J
jadx
项目概览
2301_76393173
/
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,发现更多精彩内容 >>
提交
118fa98c
编写于
12月 17, 2017
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
gui: fix incorrect settings loading
上级
001fa639
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
3 deletion
+12
-3
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
+1
-1
jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
+4
-2
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+6
-0
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
.../src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
+1
-0
未找到文件。
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
浏览文件 @
118fa98c
...
...
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
public
class
JadxCLI
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
JadxCLI
.
class
);
public
static
void
main
(
String
[]
args
)
throws
JadxException
{
public
static
void
main
(
String
[]
args
)
{
try
{
JadxCLIArgs
jadxArgs
=
new
JadxCLIArgs
();
if
(
processArgs
(
jadxArgs
,
args
))
{
...
...
jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
浏览文件 @
118fa98c
...
...
@@ -25,6 +25,8 @@ import com.beust.jcommander.ParameterException;
public
class
JadxCLIArgs
implements
IJadxArgs
{
protected
static
final
int
DEFAULT_THREADS_COUNT
=
Math
.
max
(
1
,
Runtime
.
getRuntime
().
availableProcessors
()
/
2
);
@Parameter
(
description
=
"<input file> (.dex, .apk, .jar or .class)"
)
protected
List
<
String
>
files
;
...
...
@@ -32,7 +34,7 @@ public class JadxCLIArgs implements IJadxArgs {
protected
String
outDirName
;
@Parameter
(
names
=
{
"-j"
,
"--threads-count"
},
description
=
"processing threads count"
)
protected
int
threadsCount
=
Math
.
max
(
1
,
Runtime
.
getRuntime
().
availableProcessors
()
/
2
)
;
protected
int
threadsCount
=
DEFAULT_THREADS_COUNT
;
@Parameter
(
names
=
{
"-r"
,
"--no-res"
},
description
=
"do not decode resources"
)
protected
boolean
skipResources
=
false
;
...
...
@@ -108,7 +110,7 @@ public class JadxCLIArgs implements IJadxArgs {
}
try
{
if
(
threadsCount
<=
0
)
{
throw
new
JadxException
(
"Threads count must be positive
"
);
throw
new
JadxException
(
"Threads count must be positive
, got: "
+
threadsCount
);
}
if
(
files
!=
null
)
{
for
(
String
fileName
:
files
)
{
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
浏览文件 @
118fa98c
...
...
@@ -43,6 +43,12 @@ public class JadxSettings extends JadxCLIArgs {
JadxSettingsAdapter
.
store
(
this
);
}
public
void
fixOnLoad
()
{
if
(
threadsCount
<=
0
)
{
threadsCount
=
DEFAULT_THREADS_COUNT
;
}
}
public
String
getLastOpenFilePath
()
{
return
lastOpenFilePath
;
}
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
浏览文件 @
118fa98c
...
...
@@ -50,6 +50,7 @@ public class JadxSettingsAdapter {
return
new
JadxSettings
();
}
LOG
.
debug
(
"Loaded settings: {}"
,
makeString
(
settings
));
settings
.
fixOnLoad
();
return
settings
;
}
catch
(
Exception
e
)
{
LOG
.
error
(
"Error load settings"
,
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录