Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
9614929f
Commit
9614929f
authored
Jan 16, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes build issues
parent
cc2ae80e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
JadxGUI.java
jadx-gui/src/main/java/jadx/gui/JadxGUI.java
+8
-2
JadxWrapper.java
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
+2
-2
MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+2
-1
JSourcesTest.java
jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
+2
-1
No files found.
jadx-gui/src/main/java/jadx/gui/JadxGUI.java
View file @
9614929f
...
...
@@ -5,6 +5,7 @@ import javax.swing.*;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
jadx.core.utils.exceptions.JadxException
;
import
jadx.gui.settings.JadxSettings
;
import
jadx.gui.settings.JadxSettingsAdapter
;
import
jadx.gui.ui.MainWindow
;
...
...
@@ -24,8 +25,13 @@ public class JadxGUI {
UIManager
.
setLookAndFeel
(
UIManager
.
getSystemLookAndFeelClassName
());
SwingUtilities
.
invokeLater
(
new
Runnable
()
{
public
void
run
()
{
MainWindow
window
=
new
MainWindow
(
jadxArgs
);
window
.
open
();
try
{
MainWindow
window
=
new
MainWindow
(
jadxArgs
);
window
.
open
();
}
catch
(
JadxException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
});
}
catch
(
Throwable
e
)
{
...
...
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
View file @
9614929f
...
...
@@ -22,7 +22,7 @@ public class JadxWrapper {
private
final
JadxDecompiler
decompiler
;
private
File
openFile
;
public
JadxWrapper
(
IJadxArgs
jadxArgs
)
{
public
JadxWrapper
(
IJadxArgs
jadxArgs
)
throws
JadxException
{
this
.
decompiler
=
new
JadxDecompiler
(
jadxArgs
);
}
...
...
@@ -53,7 +53,7 @@ public class JadxWrapper {
}
progressMonitor
.
close
();
LOG
.
info
(
"done"
);
}
catch
(
InterruptedException
e
)
{
}
catch
(
InterruptedException
|
JadxException
e
)
{
LOG
.
error
(
"Save interrupted"
,
e
);
Thread
.
currentThread
().
interrupt
();
}
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
View file @
9614929f
...
...
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
jadx.api.ResourceFile
;
import
jadx.core.utils.exceptions.JadxException
;
import
jadx.gui.JadxWrapper
;
import
jadx.gui.jobs.BackgroundWorker
;
import
jadx.gui.jobs.DecompileJob
;
...
...
@@ -100,7 +101,7 @@ public class MainWindow extends JFrame {
private
transient
ProgressPanel
progressPane
;
private
transient
BackgroundWorker
backgroundWorker
;
public
MainWindow
(
JadxSettings
settings
)
{
public
MainWindow
(
JadxSettings
settings
)
throws
JadxException
{
this
.
wrapper
=
new
JadxWrapper
(
settings
);
this
.
settings
=
settings
;
this
.
cacheObject
=
new
CacheObject
();
...
...
jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
View file @
9614929f
...
...
@@ -12,6 +12,7 @@ import jadx.api.JadxDecompiler;
import
jadx.api.JavaClass
;
import
jadx.api.JavaPackage
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.utils.exceptions.JadxException
;
import
jadx.gui.JadxWrapper
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
...
...
@@ -24,7 +25,7 @@ public class JSourcesTest {
private
JadxDecompiler
decompiler
;
@Before
public
void
init
()
{
public
void
init
()
throws
JadxException
{
JRoot
root
=
mock
(
JRoot
.
class
);
when
(
root
.
isFlatPackages
()).
thenReturn
(
false
);
JadxWrapper
wrapper
=
mock
(
JadxWrapper
.
class
);
...
...
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