Merge remote-tracking branch 'origin/GT-3114_ryanmkurtz_JADmessages'

This commit is contained in:
Ryan Kurtz 2019-08-27 15:14:35 -04:00
commit ace102e180
2 changed files with 5 additions and 9 deletions

View File

@ -29,7 +29,8 @@
<BLOCKQUOTE> <BLOCKQUOTE>
<P>Given a selected Android application package (APK) file, this will create an Eclipse <P>Given a selected Android application package (APK) file, this will create an Eclipse
project for that APK. It will convert the DEX file into a JAR file, then JAD the entire project for that APK. It will convert the DEX file into a JAR file, then JAD the entire
file.</P> file. Requires Java Decompiler (JAD) to be installed in
Ghidra/Features/FileFormats/os/[your_os]/jad[.exe]</P>
</BLOCKQUOTE> </BLOCKQUOTE>
<H3><A name="FSB_Load_iOS_Kernel"></A>Load iOS Kernel</H3> <H3><A name="FSB_Load_iOS_Kernel"></A>Load iOS Kernel</H3>
@ -43,7 +44,9 @@
<H3><A name="FSB_Decompile_JAR"></A>Decompile JAR</H3> <H3><A name="FSB_Decompile_JAR"></A>Decompile JAR</H3>
<BLOCKQUOTE> <BLOCKQUOTE>
<P>Given a selected JAR file, this will JAD the entire contents and create the source.</P> <P>Given a selected JAR file, this will JAD the entire contents and create the source.
Requires Java Decompiler (JAD) to be installed in
Ghidra/Features/FileFormats/os/[your_os]/jad[.exe]</P>
</BLOCKQUOTE> </BLOCKQUOTE>
<H3><A name="FSB_Create_Crypto_Key_Template"></A>Create Crypto Key Template File</H3> <H3><A name="FSB_Create_Crypto_Key_Template"></A>Create Crypto Key Template File</H3>

View File

@ -22,7 +22,6 @@ import java.util.List;
import ghidra.framework.Application; import ghidra.framework.Application;
import ghidra.framework.Platform; import ghidra.framework.Platform;
import ghidra.util.Msg;
/** /**
* Wrapper class for JAD, a JAva Decompiler. * Wrapper class for JAD, a JAva Decompiler.
@ -142,14 +141,8 @@ public class JadProcessWrapper {
} }
} }
catch (IOException ioe) { catch (IOException ioe) {
Msg.debug(JadProcessWrapper.class, ioe.getMessage());
// fall thru // fall thru
} }
Msg.debug(JadProcessWrapper.class,
"Java Decompiler (JAD) not present, some features not available until installed in:");
Msg.debug(JadProcessWrapper.class,
" Ghidra/Features/FileFormats/os/[your_os]/jad[.exe]");
Msg.debug(JadProcessWrapper.class, "and Ghidra is restarted");
return false; return false;
} }
} }