Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爽朗的琪琪
jadx
提交
92a6c333
J
jadx
项目概览
爽朗的琪琪
/
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
92a6c333
编写于
6月 20, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(gui): force jadx new version check by default
上级
358adbdd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
8 deletion
+16
-8
jadx-core/src/main/java/jadx/core/Jadx.java
jadx-core/src/main/java/jadx/core/Jadx.java
+4
-0
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+6
-2
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+1
-2
jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
+5
-4
未找到文件。
jadx-core/src/main/java/jadx/core/Jadx.java
浏览文件 @
92a6c333
...
...
@@ -244,6 +244,10 @@ public class Jadx {
return
version
;
}
public
static
boolean
isDevVersion
()
{
return
getVersion
().
equals
(
VERSION_DEV
);
}
private
static
String
searchJadxVersion
()
{
try
{
ClassLoader
classLoader
=
Jadx
.
class
.
getClassLoader
();
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
浏览文件 @
92a6c333
...
...
@@ -45,7 +45,7 @@ public class JadxSettings extends JadxCLIArgs {
private
static
final
Path
USER_HOME
=
Paths
.
get
(
System
.
getProperty
(
"user.home"
));
private
static
final
int
RECENT_PROJECTS_COUNT
=
15
;
private
static
final
int
CURRENT_SETTINGS_VERSION
=
1
7
;
private
static
final
int
CURRENT_SETTINGS_VERSION
=
1
8
;
private
static
final
Font
DEFAULT_FONT
=
new
RSyntaxTextArea
().
getFont
();
...
...
@@ -59,7 +59,7 @@ public class JadxSettings extends JadxCLIArgs {
private
Path
lastOpenFilePath
=
USER_HOME
;
private
Path
lastSaveFilePath
=
USER_HOME
;
private
boolean
flattenPackage
=
false
;
private
boolean
checkForUpdates
=
fals
e
;
private
boolean
checkForUpdates
=
tru
e
;
private
List
<
Path
>
recentProjects
=
new
ArrayList
<>();
private
String
fontStr
=
""
;
private
String
smaliFontStr
=
""
;
...
...
@@ -715,6 +715,10 @@ public class JadxSettings extends JadxCLIArgs {
}
fromVersion
++;
}
if
(
fromVersion
==
17
)
{
checkForUpdates
=
true
;
fromVersion
++;
}
if
(
fromVersion
!=
CURRENT_SETTINGS_VERSION
)
{
LOG
.
warn
(
"Incorrect settings upgrade. Expected version: {}, got: {}"
,
CURRENT_SETTINGS_VERSION
,
fromVersion
);
}
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
浏览文件 @
92a6c333
...
...
@@ -814,7 +814,6 @@ public class MainWindow extends JFrame {
}
private
void
initMenuAndToolbar
()
{
final
boolean
devVersion
=
(
Jadx
.
VERSION_DEV
.
equals
(
Jadx
.
getVersion
()));
Action
openAction
=
new
AbstractAction
(
NLS
.
str
(
"file.open_action"
),
ICON_OPEN
)
{
@Override
public
void
actionPerformed
(
ActionEvent
e
)
{
...
...
@@ -1124,7 +1123,7 @@ public class MainWindow extends JFrame {
JMenu
help
=
new
JMenu
(
NLS
.
str
(
"menu.help"
));
help
.
setMnemonic
(
KeyEvent
.
VK_H
);
help
.
add
(
logAction
);
if
(
devVersion
)
{
if
(
Jadx
.
isDevVersion
()
)
{
help
.
add
(
new
AbstractAction
(
"Show sample error report"
)
{
@Override
public
void
actionPerformed
(
ActionEvent
e
)
{
...
...
jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
浏览文件 @
92a6c333
...
...
@@ -15,6 +15,7 @@ import com.google.gson.Gson;
import
com.google.gson.reflect.TypeToken
;
import
jadx.api.JadxDecompiler
;
import
jadx.core.Jadx
;
import
jadx.gui.update.data.Release
;
@SuppressWarnings
(
"SameParameterValue"
)
...
...
@@ -56,8 +57,7 @@ public class JadxUpdate {
}
private
static
Release
checkForNewRelease
()
throws
IOException
{
String
version
=
JadxDecompiler
.
getVersion
();
if
(
version
.
contains
(
"dev"
))
{
if
(
Jadx
.
isDevVersion
())
{
LOG
.
debug
(
"Ignore check for update: development version"
);
return
null
;
}
...
...
@@ -65,11 +65,12 @@ public class JadxUpdate {
if
(
latest
==
null
)
{
return
null
;
}
String
currentVersion
=
JadxDecompiler
.
getVersion
();
String
latestName
=
latest
.
getName
();
if
(
latestName
.
equalsIgnoreCase
(
v
ersion
))
{
if
(
latestName
.
equalsIgnoreCase
(
currentV
ersion
))
{
return
null
;
}
if
(
VersionComparator
.
checkAndCompare
(
v
ersion
,
latestName
)
>=
0
)
{
if
(
VersionComparator
.
checkAndCompare
(
currentV
ersion
,
latestName
)
>=
0
)
{
return
null
;
}
LOG
.
info
(
"Found new jadx version: {}"
,
latest
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录