desu/ns-usbloader
1
0
Fork 0
Code Pull requests Releases Wiki Activity Actions

Fix TinFoil-related things broken since v0.8+

Browse source
This commit is contained in:
Dmitry Isaenko 2019-12-18 06:29:49 +03:00
parent 8c81b86188
commit ce6b8078d7
5 changed files with 87 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -8,7 +8,7 @@
<name>NS-USBloader</name> <name>NS-USBloader</name>
<artifactId>ns-usbloader</artifactId> <artifactId>ns-usbloader</artifactId>
<version>0.9-SNAPSHOT</version> <version>0.9.1-SNAPSHOT</version>
<url>https://github.com/developersu/ns-usbloader/</url> <url>https://github.com/developersu/ns-usbloader/</url>
<description> <description>

148
src/main/java/nsusbloader/COM/USB/TinFoil.java
View file

@ -20,9 +20,11 @@ import java.util.LinkedHashMap;
* Tinfoil processing * Tinfoil processing
* */ * */
class TinFoil extends TransferModule { class TinFoil extends TransferModule {
// "TUL0".getBytes(StandardCharsets.US_ASCII)
private static final byte[] TUL0 = new byte[]{(byte) 0x54, (byte) 0x55, (byte) 0x4c, (byte) 0x30};
TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, LogPrinter logPrinter){ TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, LogPrinter logPrinter){
super(handler, nspMap, task, logPrinter); super(handler, nspMap, task, logPrinter);
logPrinter.print("============= TinFoil =============", EMsgType.INFO); logPrinter.print("============= TinFoil =============", EMsgType.INFO);
if (!sendListOfNSP()) if (!sendListOfNSP())
@ -35,14 +37,6 @@ class TinFoil extends TransferModule {
* Send what NSP will be transferred * Send what NSP will be transferred
* */ * */
private boolean sendListOfNSP(){ private boolean sendListOfNSP(){
// Send list of NSP files:
// Proceed "TUL0"
if (writeUsb("TUL0".getBytes(StandardCharsets.US_ASCII))) { // new byte[]{(byte) 0x54, (byte) 0x55, (byte) 0x76, (byte) 0x30}
logPrinter.print("TF Send list of files: handshake", EMsgType.FAIL);
return false;
}
else
logPrinter.print("TF Send list of files: handshake", EMsgType.PASS);
//Collect file names //Collect file names
StringBuilder nspListNamesBuilder = new StringBuilder(); // Add every title to one stringBuilder StringBuilder nspListNamesBuilder = new StringBuilder(); // Add every title to one stringBuilder
for(String nspFileName: nspMap.keySet()) { for(String nspFileName: nspMap.keySet()) {
@ -53,28 +47,34 @@ class TinFoil extends TransferModule {
byte[] nspListNames = nspListNamesBuilder.toString().getBytes(StandardCharsets.UTF_8); byte[] nspListNames = nspListNamesBuilder.toString().getBytes(StandardCharsets.UTF_8);
ByteBuffer byteBuffer = ByteBuffer.allocate(Integer.BYTES).order(ByteOrder.LITTLE_ENDIAN); // integer = 4 bytes; BTW Java is stored in big-endian format ByteBuffer byteBuffer = ByteBuffer.allocate(Integer.BYTES).order(ByteOrder.LITTLE_ENDIAN); // integer = 4 bytes; BTW Java is stored in big-endian format
byteBuffer.putInt(nspListNames.length); // This way we obtain length in int converted to byte array in correct Big-endian order. Trust me. byteBuffer.putInt(nspListNames.length); // This way we obtain length in int converted to byte array in correct Big-endian order. Trust me.
byte[] nspListSize = byteBuffer.array(); // TODO: rewind? not sure.. byte[] nspListSize = byteBuffer.array();
//byteBuffer.reset();
logPrinter.print("TF Send list of files:", EMsgType.INFO);
// Proceed "TUL0"
if (writeUsb(TUL0)) {
logPrinter.print(" handshake [1/4]", EMsgType.FAIL);
return false;
}
logPrinter.print(" handshake [1/4]", EMsgType.PASS);
// Sending NSP list // Sending NSP list
logPrinter.print("TF Send list of files", EMsgType.INFO);
if (writeUsb(nspListSize)) { // size of the list we're going to transfer goes... if (writeUsb(nspListSize)) { // size of the list we're going to transfer goes...
logPrinter.print(" [send list length]", EMsgType.FAIL); logPrinter.print(" list length [2/4]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [send list length]", EMsgType.PASS); logPrinter.print(" list length [2/4]", EMsgType.PASS);
if (writeUsb(new byte[8])) { // 8 zero bytes goes... if (writeUsb(new byte[8])) { // 8 zero bytes goes...
logPrinter.print(" [send padding]", EMsgType.FAIL); logPrinter.print(" padding [3/4]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [send padding]", EMsgType.PASS); logPrinter.print(" padding [3/4]", EMsgType.PASS);
if (writeUsb(nspListNames)) { // list of the names goes... if (writeUsb(nspListNames)) { // list of the names goes...
logPrinter.print(" [send list itself]", EMsgType.FAIL); logPrinter.print(" list itself [4/4]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [send list itself]", EMsgType.PASS); logPrinter.print(" list itself [4/4]", EMsgType.PASS);
return true; return true;
} }
@ -108,7 +108,7 @@ class TinFoil extends TransferModule {
return true; // All interaction with USB device should be ended (expected); return true; // All interaction with USB device should be ended (expected);
} }
else if ((receivedArray[8] == 0x01) || (receivedArray[8] == 0x02)){ //0x01 - file range; 0x02 unknown bug on backend side (dirty hack). else if ((receivedArray[8] == 0x01) || (receivedArray[8] == 0x02)){ //0x01 - file range; 0x02 unknown bug on backend side (dirty hack).
logPrinter.print("TF Received 'FILE RANGE' command. Proceeding: [0x0"+receivedArray[8]+"]", EMsgType.PASS); logPrinter.print("TF Received 'FILE RANGE' command [0x0"+receivedArray[8]+"].", EMsgType.PASS);
/*// We can get in this pocket a length of file name (+32). Why +32? I dunno man.. Do we need this? Definitely not. This app can live without it. /*// We can get in this pocket a length of file name (+32). Why +32? I dunno man.. Do we need this? Definitely not. This app can live without it.
long receivedSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 12,20)).order(ByteOrder.LITTLE_ENDIAN).getLong(); long receivedSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 12,20)).order(ByteOrder.LITTLE_ENDIAN).getLong();
logsArea.appendText("[V] Received FILE_RANGE command. Size: "+Long.toUnsignedString(receivedSize)+"\n"); // this shit returns string that will be chosen next '+32'. And, BTW, can't be greater then 512 logsArea.appendText("[V] Received FILE_RANGE command. Size: "+Long.toUnsignedString(receivedSize)+"\n"); // this shit returns string that will be chosen next '+32'. And, BTW, can't be greater then 512
@ -127,30 +127,31 @@ class TinFoil extends TransferModule {
private boolean fileRangeCmd(){ private boolean fileRangeCmd(){
byte[] receivedArray; byte[] receivedArray;
// Here we take information of what other side wants // Here we take information of what other side wants
receivedArray = readUsb(); if ((receivedArray = readUsb()) == null)
if (receivedArray == null)
return false; return false;
// range_offset of the requested file. In the begining it will be 0x10. // range_offset of the requested file. In the beginning it will be 0x10.
long receivedRangeSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 0,8)).order(ByteOrder.LITTLE_ENDIAN).getLong(); // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb long receivedRangeSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 0,8)).order(ByteOrder.LITTLE_ENDIAN).getLong(); // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb
byte[] receivedRangeSizeRAW = Arrays.copyOfRange(receivedArray, 0,8); // used (only) when we use sendResponse(). It's just simply. byte[] receivedRangeSizeRAW = Arrays.copyOfRange(receivedArray, 0,8); // used (only) when we use sendResponse().
long receivedRangeOffset = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 8,16)).order(ByteOrder.LITTLE_ENDIAN).getLong(); // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb long receivedRangeOffset = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 8,16)).order(ByteOrder.LITTLE_ENDIAN).getLong(); // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb
/* Below, it's REAL NSP file name length that we sent before among others (WITHOUT +32 byes). It can't be greater then... see what is written in the beginning of this code. /* Below, it's REAL NSP file name length that we sent before among others (WITHOUT +32 byes). It can't be greater then... see what is written in the beginning of this code.
We don't need this since in next pocket we'll get name itself UTF-8 encoded. Could be used to double-checks or something like that. We don't need this since in next pocket we'll get name itself UTF-8 encoded. Could be used to double-checks or something like that.
long receivedNspNameLen = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 16,24)).order(ByteOrder.LITTLE_ENDIAN).getLong(); */ long receivedNspNameLen = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 16,24)).order(ByteOrder.LITTLE_ENDIAN).getLong(); */
// Requesting UTF-8 file name required: // Requesting UTF-8 file name required:
receivedArray = readUsb(); if ((receivedArray = readUsb()) == null)
if (receivedArray == null)
return false; return false;
String receivedRequestedNSP = new String(receivedArray, StandardCharsets.UTF_8); String receivedRequestedNSP = new String(receivedArray, StandardCharsets.UTF_8);
logPrinter.print("TF Reply to requested file: "+receivedRequestedNSP logPrinter.print(String.format("TF Reply for: %s" +
+"\n Range Size: "+receivedRangeSize "\n Offset: %-20d 0x%x" +
+"\n Range Offset: "+receivedRangeOffset, EMsgType.INFO); "\n Size: %-20d 0x%x",
receivedRequestedNSP,
receivedRangeOffset, receivedRangeOffset,
receivedRangeSize, receivedRangeSize), EMsgType.INFO);
// Sending response header // Sending response header
if (!sendResponse(receivedRangeSizeRAW)) // Get receivedRangeSize in 'RAW' format exactly as it has been received. It's simply. if (! sendResponse(receivedRangeSizeRAW)) // Get receivedRangeSize in 'RAW' format exactly as it has been received to simplify the process.
return false; return false;
try { try {
@ -164,7 +165,7 @@ class TinFoil extends TransferModule {
if (nspMap.get(receivedRequestedNSP).isDirectory()){ if (nspMap.get(receivedRequestedNSP).isDirectory()){
NSSplitReader nsSplitReader = new NSSplitReader(nspMap.get(receivedRequestedNSP), receivedRangeSize); NSSplitReader nsSplitReader = new NSSplitReader(nspMap.get(receivedRequestedNSP), receivedRangeSize);
if (nsSplitReader.seek(receivedRangeOffset) != receivedRangeOffset){ if (nsSplitReader.seek(receivedRangeOffset) != receivedRangeOffset){
logPrinter.print("TF Requested skip is out of file size. Nothing to transmit.", EMsgType.FAIL); logPrinter.print("TF Requested offset is out of file size. Nothing to transmit.", EMsgType.FAIL);
return false; return false;
} }
@ -179,20 +180,17 @@ class TinFoil extends TransferModule {
bufferCurrent = new byte[readPice]; // TODO: not perfect moment, consider refactoring. bufferCurrent = new byte[readPice]; // TODO: not perfect moment, consider refactoring.
if (nsSplitReader.read(bufferCurrent) != readPice) { // changed since @ v0.3.2 if (nsSplitReader.read(bufferCurrent) != readPice) { // changed since @ v0.3.2
logPrinter.print("TF Reading of stream suddenly ended.", EMsgType.WARNING); logPrinter.print("TF Reading from stream suddenly ended.", EMsgType.WARNING);
return false; return false;
} }
//write to USB //write to USB
if (writeUsb(bufferCurrent)) { if (writeUsb(bufferCurrent)) {
logPrinter.print("TF Failure during NSP transmission.", EMsgType.FAIL); logPrinter.print("TF Failure during file transfer.", EMsgType.FAIL);
return false; return false;
} }
currentOffset += readPice; currentOffset += readPice;
} }
nsSplitReader.close(); nsSplitReader.close();
//---Tell progress to UI---/
logPrinter.updateProgress(1.0);
//------------------------/
} }
//---------------! Split files end !--------------- //---------------! Split files end !---------------
//---------------! Regular files start !--------------- //---------------! Regular files start !---------------
@ -200,14 +198,21 @@ class TinFoil extends TransferModule {
BufferedInputStream bufferedInStream = new BufferedInputStream(new FileInputStream(nspMap.get(receivedRequestedNSP))); // TODO: refactor? BufferedInputStream bufferedInStream = new BufferedInputStream(new FileInputStream(nspMap.get(receivedRequestedNSP))); // TODO: refactor?
if (bufferedInStream.skip(receivedRangeOffset) != receivedRangeOffset) { if (bufferedInStream.skip(receivedRangeOffset) != receivedRangeOffset) {
logPrinter.print("TF Requested skip is out of file size. Nothing to transmit.", EMsgType.FAIL); logPrinter.print("TF Requested offset is out of file size. Nothing to transmit.", EMsgType.FAIL);
return false; return false;
} }
/*
File dir = new File(System.getProperty("user.home")+File.separator+"DBG_"+receivedRequestedNSP); //todo: remove
dir.mkdirs(); //todo: remove
File chunkFile = new File(System.getProperty("user.home")+File.separator+"DBG_"+receivedRequestedNSP+File.separator+receivedRangeSize+"_"+receivedRangeOffset+".part"); //todo: remove
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(chunkFile)); //todo: remove
*/
while (currentOffset < receivedRangeSize) { while (currentOffset < receivedRangeSize) {
if ((currentOffset + readPice) >= receivedRangeSize) if ((currentOffset + readPice) >= receivedRangeSize)
readPice = Math.toIntExact(receivedRangeSize - currentOffset); readPice = Math.toIntExact(receivedRangeSize - currentOffset);
//System.out.println("CO: "+currentOffset+"\t\tEO: "+receivedRangeSize+"\t\tRP: "+readPice); // NOTE: DEBUG //System.out.println("CO: "+currentOffset+"\t\tEO: "+receivedRangeSize+"\t\tRP: "+readPice); // NOTE: DEBUG
//logPrinter.print(String.format("CO: %-20d EO: %-20d RP: %d\n", currentOffset, receivedRangeSize, readPice), EMsgType.NULL); // NOTE: better DEBUG
// updating progress bar (if a lot of data requested) START BLOCK // updating progress bar (if a lot of data requested) START BLOCK
//---Tell progress to UI---/ //---Tell progress to UI---/
logPrinter.updateProgress((currentOffset + readPice) / (receivedRangeSize / 100.0) / 100.0); logPrinter.updateProgress((currentOffset + readPice) / (receivedRangeSize / 100.0) / 100.0);
@ -215,22 +220,25 @@ class TinFoil extends TransferModule {
bufferCurrent = new byte[readPice]; // TODO: not perfect moment, consider refactoring. bufferCurrent = new byte[readPice]; // TODO: not perfect moment, consider refactoring.
if (bufferedInStream.read(bufferCurrent) != readPice) { // changed since @ v0.3.2 if (bufferedInStream.read(bufferCurrent) != readPice) { // changed since @ v0.3.2
logPrinter.print("TF Reading of stream suddenly ended.", EMsgType.WARNING); logPrinter.print("TF Reading from stream suddenly ended.", EMsgType.WARNING);
return false; return false;
} }
//write to USB //write to USB
//bos.write(bufferCurrent); //todo: remove
if (writeUsb(bufferCurrent)) { if (writeUsb(bufferCurrent)) {
logPrinter.print("TF Failure during NSP transmission.", EMsgType.FAIL); logPrinter.print("TF Failure during file transfer.", EMsgType.FAIL);
return false; return false;
} }
currentOffset += readPice; currentOffset += readPice;
} }
bufferedInStream.close(); bufferedInStream.close();
//---Tell progress to UI---/ //bos.close(); //todo: remove
logPrinter.updateProgress(1.0);
//------------------------/
} }
//---------------! Regular files end !--------------- //---------------! Regular files end !---------------
//---Tell progress to UI---/
logPrinter.updateProgress(1.0);
} catch (FileNotFoundException fnfe){ } catch (FileNotFoundException fnfe){
logPrinter.print("TF FileNotFoundException:\n "+fnfe.getMessage(), EMsgType.FAIL); logPrinter.print("TF FileNotFoundException:\n "+fnfe.getMessage(), EMsgType.FAIL);
fnfe.printStackTrace(); fnfe.printStackTrace();
@ -256,27 +264,29 @@ class TinFoil extends TransferModule {
* @return true if everything OK * @return true if everything OK
* false if failed * false if failed
* */ * */
private boolean sendResponse(byte[] rangeSize){ // This method as separate function itself for application needed as a cookie in the middle of desert. private boolean sendResponse(byte[] rangeSize){ // This method as separate function itself for application needed as a cookie in the middle of desert.
logPrinter.print("TF Sending response", EMsgType.INFO); final byte[] standardReplyBytes = new byte[] { 0x54, 0x55, 0x43, 0x30, // 'TUC0'
if (writeUsb(new byte[] { (byte) 0x54, (byte) 0x55, (byte) 0x43, (byte) 0x30, // 'TUC0' 0x01, 0x00, 0x00, 0x00, // CMD_TYPE_RESPONSE = 1
(byte) 0x01, // CMD_TYPE_RESPONSE = 1 0x01, 0x00, 0x00, 0x00 };
(byte) 0x00, (byte) 0x00, (byte) 0x00, // kinda padding. Guys, didn't you want to use integer value for CMD semantic?
(byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00} ) // Send integer value of '1' in Little-endian format. final byte[] twelveZeroBytes = new byte[12];
//logPrinter.print("TF Sending response", EMsgType.INFO);
if (writeUsb(standardReplyBytes) // Send integer value of '1' in Little-endian format.
){ ){
logPrinter.print(" [1/3]", EMsgType.FAIL); logPrinter.print("TF Sending response failed [1/3]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [1/3]", EMsgType.PASS);
if(writeUsb(rangeSize)) { // Send EXACTLY what has been received if(writeUsb(rangeSize)) { // Send EXACTLY what has been received
logPrinter.print(" [2/3]", EMsgType.FAIL); logPrinter.print("TF Sending response failed [2/3]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [2/3]", EMsgType.PASS);
if(writeUsb(new byte[12])) { // kinda another one padding if(writeUsb(twelveZeroBytes)) { // kinda another one padding
logPrinter.print(" [3/3]", EMsgType.FAIL); logPrinter.print("TF Sending response failed [3/3]", EMsgType.FAIL);
return false; return false;
} }
logPrinter.print(" [3/3]", EMsgType.PASS); logPrinter.print("TF Sending response complete (3/3)", EMsgType.PASS);
return true; return true;
} }
@ -290,23 +300,31 @@ class TinFoil extends TransferModule {
writeBuffer.put(message); // Don't do writeBuffer.rewind(); writeBuffer.put(message); // Don't do writeBuffer.rewind();
IntBuffer writeBufTransferred = IntBuffer.allocate(1); IntBuffer writeBufTransferred = IntBuffer.allocate(1);
int result; int result;
//int varVar = 0; //todo:remove
while (! task.isCancelled()) { while (! task.isCancelled()) {
result = LibUsb.bulkTransfer(handlerNS, (byte) 0x01, writeBuffer, writeBufTransferred, 1000); // last one is TIMEOUT. 0 stands for unlimited. Endpoint OUT = 0x01 /*
if (varVar != 0)
logPrinter.print("writeUsb() retry cnt: "+varVar, EMsgType.INFO); //todo:remove
varVar++;
*/
result = LibUsb.bulkTransfer(handlerNS, (byte) 0x01, writeBuffer, writeBufTransferred, 5050); // last one is TIMEOUT. 0 stands for unlimited. Endpoint OUT = 0x01
switch (result){ switch (result){
case LibUsb.SUCCESS: case LibUsb.SUCCESS:
if (writeBufTransferred.get() == message.length) if (writeBufTransferred.get() == message.length)
return false; return false;
else { logPrinter.print("TF Data transfer issue [write]" +
logPrinter.print("TF Data transfer issue [write]\n Requested: "+message.length+"\n Transferred: "+writeBufTransferred.get(), EMsgType.FAIL); "\n Requested: "+message.length+
return true; "\n Transferred: "+writeBufTransferred.get(), EMsgType.FAIL);
} return true;
case LibUsb.ERROR_TIMEOUT: case LibUsb.ERROR_TIMEOUT:
//System.out.println("writeBuffer position: "+writeBuffer.position()+" "+writeBufTransferred.get());
//writeBufTransferred.clear(); // MUST BE HERE IF WE 'GET()' IT
continue; continue;
default: default:
logPrinter.print("TF Data transfer issue [write]\n Returned: "+ UsbErrorCodes.getErrCode(result), EMsgType.FAIL); logPrinter.print("TF Data transfer issue [write]" +
logPrinter.print("TF Execution stopped", EMsgType.FAIL); "\n Returned: "+ UsbErrorCodes.getErrCode(result) +
"\n (execution stopped)", EMsgType.FAIL);
return true; return true;
} }
} }
@ -322,7 +340,6 @@ class TinFoil extends TransferModule {
ByteBuffer readBuffer = ByteBuffer.allocateDirect(512); ByteBuffer readBuffer = ByteBuffer.allocateDirect(512);
// We can limit it to 32 bytes, but there is a non-zero chance to got OVERFLOW from libusb. // We can limit it to 32 bytes, but there is a non-zero chance to got OVERFLOW from libusb.
IntBuffer readBufTransferred = IntBuffer.allocate(1); IntBuffer readBufTransferred = IntBuffer.allocate(1);
int result; int result;
while (! task.isCancelled()) { while (! task.isCancelled()) {
result = LibUsb.bulkTransfer(handlerNS, (byte) 0x81, readBuffer, readBufTransferred, 1000); // last one is TIMEOUT. 0 stands for unlimited. Endpoint IN = 0x81 result = LibUsb.bulkTransfer(handlerNS, (byte) 0x81, readBuffer, readBufTransferred, 1000); // last one is TIMEOUT. 0 stands for unlimited. Endpoint IN = 0x81
@ -336,8 +353,9 @@ class TinFoil extends TransferModule {
case LibUsb.ERROR_TIMEOUT: case LibUsb.ERROR_TIMEOUT:
continue; continue;
default: default:
logPrinter.print("TF Data transfer issue [read]\n Returned: " + UsbErrorCodes.getErrCode(result), EMsgType.FAIL); logPrinter.print("TF Data transfer issue [read]" +
logPrinter.print("TF Execution stopped", EMsgType.FAIL); "\n Returned: " + UsbErrorCodes.getErrCode(result)+
"\n (execution stopped)", EMsgType.FAIL);
return null; return null;
} }
} }

2
src/main/java/nsusbloader/COM/USB/UsbConnect.java
View file

@ -150,7 +150,7 @@ class UsbConnect {
int result = LibUsb.releaseInterface(handlerNS, DEFAULT_INTERFACE); int result = LibUsb.releaseInterface(handlerNS, DEFAULT_INTERFACE);
if (result != LibUsb.SUCCESS) if (result != LibUsb.SUCCESS)
logPrinter.print("Release interface\n Returned: "+result+" (sometimes it's not an issue)", EMsgType.WARNING); logPrinter.print("Release interface\n Returned: "+result+" (sometimes it's not an issue)", EMsgType.WARNING);
else else
logPrinter.print("Release interface", EMsgType.PASS); logPrinter.print("Release interface", EMsgType.PASS);

2
src/main/java/nsusbloader/NSLDataTypes/EMsgType.java
View file

@ -1,5 +1,5 @@
package nsusbloader.NSLDataTypes; package nsusbloader.NSLDataTypes;
public enum EMsgType { public enum EMsgType {
PASS, FAIL, INFO, WARNING PASS, FAIL, INFO, WARNING, NULL
} }

2
src/main/java/nsusbloader/NSLMain.java
View file

@ -12,7 +12,7 @@ import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class NSLMain extends Application { public class NSLMain extends Application {
public static final String appVersion = "v0.9"; public static final String appVersion = "v0.9.1";
@Override @Override
public void start(Stage primaryStage) throws Exception{ public void start(Stage primaryStage) throws Exception{
FXMLLoader loader = new FXMLLoader(getClass().getResource("/NSLMain.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("/NSLMain.fxml"));