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
7c53b985
Commit
7c53b985
authored
Jul 19, 2019
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(gui): remove JCertificate node
parent
c8df26f2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
107 deletions
+1
-107
JCertificate.java
jadx-gui/src/main/java/jadx/gui/treemodel/JCertificate.java
+0
-77
JRoot.java
jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
+0
-21
MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+1
-2
TabbedPane.java
jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
+0
-4
Messages_en_US.properties
jadx-gui/src/main/resources/i18n/Messages_en_US.properties
+0
-1
Messages_es_ES.properties
jadx-gui/src/main/resources/i18n/Messages_es_ES.properties
+0
-1
Messages_zh_CN.properties
jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties
+0
-1
No files found.
jadx-gui/src/main/java/jadx/gui/treemodel/JCertificate.java
deleted
100644 → 0
View file @
c8df26f2
package
jadx
.
gui
.
treemodel
;
import
java.io.BufferedInputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipFile
;
import
javax.swing.*
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
jadx.api.ResourceFile
;
import
jadx.core.utils.files.ZipSecurity
;
import
jadx.gui.utils.CertificateManager
;
import
jadx.gui.utils.NLS
;
import
jadx.gui.utils.UiUtils
;
public
class
JCertificate
extends
JNode
{
private
static
final
long
serialVersionUID
=
4308696770188518731L
;
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
JCertificate
.
class
);
private
static
final
ImageIcon
CERTIFICATE_ICON
=
UiUtils
.
openIcon
(
"certificate_obj"
);
private
final
transient
ResourceFile
rf
;
public
JCertificate
(
ResourceFile
resFile
)
{
this
.
rf
=
resFile
;
}
@Override
public
JClass
getJParent
()
{
return
null
;
}
@Override
public
Icon
getIcon
()
{
return
CERTIFICATE_ICON
;
}
@Override
public
String
makeString
()
{
return
NLS
.
str
(
"certificate.title"
);
}
@Override
public
String
getContent
()
{
try
{
ResourceFile
.
ZipRef
zipRef
=
rf
.
getZipRef
();
if
(
zipRef
==
null
)
{
File
file
=
new
File
(
rf
.
getName
());
try
(
InputStream
inputStream
=
new
BufferedInputStream
(
new
FileInputStream
(
file
)))
{
return
CertificateManager
.
decode
(
inputStream
);
}
}
else
{
try
(
ZipFile
zipFile
=
new
ZipFile
(
zipRef
.
getZipFile
()))
{
ZipEntry
entry
=
zipFile
.
getEntry
(
zipRef
.
getEntryName
());
if
(
entry
==
null
)
{
throw
new
IOException
(
"Zip entry not found: "
+
zipRef
);
}
if
(!
ZipSecurity
.
isValidZipEntry
(
entry
))
{
return
null
;
}
try
(
InputStream
inputStream
=
new
BufferedInputStream
(
zipFile
.
getInputStream
(
entry
)))
{
return
CertificateManager
.
decode
(
inputStream
);
}
}
}
}
catch
(
Exception
e
)
{
LOG
.
error
(
"Certificate decode error: {}"
,
rf
.
getName
(),
e
);
return
"Decode error: "
+
e
.
getMessage
();
}
}
}
jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
View file @
7c53b985
...
...
@@ -42,11 +42,6 @@ public class JRoot extends JNode {
if
(
signature
!=
null
)
{
add
(
signature
);
}
JCertificate
certificate
=
getCertificate
(
wrapper
.
getResources
());
if
(
certificate
!=
null
)
{
add
(
certificate
);
}
}
private
List
<
JResource
>
getHierarchyResources
(
List
<
ResourceFile
>
resources
)
{
...
...
@@ -82,22 +77,6 @@ public class JRoot extends JNode {
return
Collections
.
singletonList
(
root
);
}
private
JCertificate
getCertificate
(
List
<
ResourceFile
>
resources
)
{
if
(
resources
.
isEmpty
())
{
return
null
;
}
for
(
ResourceFile
rf
:
resources
)
{
if
(
rf
.
getZipRef
()
!=
null
)
{
String
rfName
=
rf
.
getName
().
toUpperCase
();
if
(
rfName
.
endsWith
(
".DSA"
)
||
rfName
.
endsWith
(
".RSA"
))
{
return
new
JCertificate
(
rf
);
}
}
}
return
null
;
}
private
JResource
getResourceByName
(
JResource
rf
,
String
name
)
{
for
(
JResource
sub
:
rf
.
getFiles
())
{
if
(
sub
.
getName
().
equals
(
name
))
{
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
View file @
7c53b985
...
...
@@ -51,7 +51,6 @@ import jadx.gui.settings.JadxProject;
import
jadx.gui.settings.JadxSettings
;
import
jadx.gui.settings.JadxSettingsWindow
;
import
jadx.gui.treemodel.ApkSignature
;
import
jadx.gui.treemodel.JCertificate
;
import
jadx.gui.treemodel.JClass
;
import
jadx.gui.treemodel.JLoadableNode
;
import
jadx.gui.treemodel.JNode
;
...
...
@@ -492,7 +491,7 @@ public class MainWindow extends JFrame {
if
(
resFile
!=
null
&&
JResource
.
isSupportedForView
(
resFile
.
getType
()))
{
tabbedPane
.
showResource
(
res
);
}
}
else
if
(
obj
instanceof
JCertificate
||
obj
instanceof
ApkSignature
)
{
}
else
if
(
obj
instanceof
ApkSignature
)
{
tabbedPane
.
showSimpleNode
((
JNode
)
obj
);
}
else
if
(
obj
instanceof
JNode
)
{
JNode
node
=
(
JNode
)
obj
;
...
...
jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
View file @
7c53b985
...
...
@@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory;
import
jadx.api.ResourceFile
;
import
jadx.api.ResourceType
;
import
jadx.gui.treemodel.ApkSignature
;
import
jadx.gui.treemodel.JCertificate
;
import
jadx.gui.treemodel.JClass
;
import
jadx.gui.treemodel.JNode
;
import
jadx.gui.treemodel.JResource
;
...
...
@@ -178,9 +177,6 @@ public class TabbedPane extends JTabbedPane {
if
(
node
instanceof
ApkSignature
)
{
return
new
HtmlPanel
(
this
,
node
);
}
if
(
node
instanceof
JCertificate
)
{
return
new
CertificatePanel
(
this
,
node
);
}
return
new
ClassCodeContentPanel
(
this
,
node
);
}
...
...
jadx-gui/src/main/resources/i18n/Messages_en_US.properties
View file @
7c53b985
...
...
@@ -151,7 +151,6 @@ confirm.save_as_message=%s already exists.\nDo you want to replace it?
confirm.not_saved_title
=
Save project
confirm.not_saved_message
=
Save the current project before proceeding?
certificate.title
=
Certificate
certificate.cert_type
=
Type
certificate.serialSigVer
=
Version
certificate.serialNumber
=
Serial number
...
...
jadx-gui/src/main/resources/i18n/Messages_es_ES.properties
View file @
7c53b985
...
...
@@ -151,7 +151,6 @@ popup.select_all=Seleccionar todo
#confirm.not_saved_title=
#confirm.not_saved_message=
certificate.title
=
Certificado
certificate.cert_type
=
Tipo
certificate.serialSigVer
=
Versión
certificate.serialNumber
=
Número de serial
...
...
jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties
View file @
7c53b985
...
...
@@ -151,7 +151,6 @@ confirm.save_as_message=%s 已存在。\n你想替换它吗?
confirm.not_saved_title
=
保存项目
confirm.not_saved_message
=
在继续之前保存当前项目?
certificate.title
=
证书
certificate.cert_type
=
类型
certificate.serialSigVer
=
版本
certificate.serialNumber
=
序列号
...
...
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