From a429aef30b23f5791667118bca546b1603b4b07d Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Wed, 10 Jul 2019 04:48:13 +0300 Subject: [PATCH] v0.5.2 Readme updates. Minor refactoring and one typo fix. Publishing v0.5.2 =) --- README.md | 6 ++++-- .../java/nsusbloader/USB/UsbCommunications.java | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5b96ec0..fe176ef 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ NS-USBloader is a PC-side **[Adubbz/TinFoil](https://github.com/Adubbz/Tinfoil/)** (version 0.2.1; USB and Network) and **GoldLeaf** (USB) NSP installer. Replacement for default **usb_install_pc.py**, **remote_install_pc.py** *(never ever use this. even if you brave. no idea why it works.)* and **GoldTree**. +[Click here for Android version ;)](https://github.com/developersu/ns-usbloader-mobile) + With GUI and cookies. Works on Windows, macOS and Linux. Sometimes I add new posts about this project [on my home page](https://developersu.blogspot.com/search/label/NS-USBloader). @@ -115,7 +117,7 @@ Upload somewhere (pastebin? google drive? whatever else). [Create new issue](htt NOTE: actually it's not gonna work in real, because we should stay in touch and I'll need you when add something that should be translated =( #### TODO (maybe): -- [ ] Android support (WIP) +- [x] [Android support](https://github.com/developersu/ns-usbloader-mobile) - [ ] File order sort (non-critical) - [ ] More deep file analyze before uploading. - [ ] XCI support @@ -133,7 +135,7 @@ PayPal: To-be-done. *Legal information: * [EN] Please note! This is non-commercial application. Any received money considered as a gift. -* [RU] Пожалуйста обратите внимание! Это некоммерческое приложение. Перечисляя деньги вы совершаете акт дарения. +* [RU] Пожалуйста обратите внимание! Это некоммерческое приложение. Перечисляя деньги вы совершаете дарение. ##### Thanks Appreciate assistance and support of both Vitaliy and Konstantin. Without you all this magic would not have happened. diff --git a/src/main/java/nsusbloader/USB/UsbCommunications.java b/src/main/java/nsusbloader/USB/UsbCommunications.java index 428113a..88682f5 100644 --- a/src/main/java/nsusbloader/USB/UsbCommunications.java +++ b/src/main/java/nsusbloader/USB/UsbCommunications.java @@ -486,18 +486,18 @@ public class UsbCommunications extends Task { byte[] readByte; // Go connect to GoldLeaf - if (writeToUsb(CMD_GLUC)) - logPrinter.print("GL Initiating GoldLeaf connection: 1/2", EMsgType.PASS); - else { + + if (!writeToUsb(CMD_GLUC)) { logPrinter.print("GL Initiating GoldLeaf connection: 1/2", EMsgType.FAIL); return false; } - if (writeToUsb(CMD_ConnectionRequest)) - logPrinter.print("GL Initiating GoldLeaf connection: 2/2", EMsgType.PASS); - else { + logPrinter.print("GL Initiating GoldLeaf connection: 1/2", EMsgType.PASS); + if (!writeToUsb(CMD_ConnectionRequest)){ logPrinter.print("GL Initiating GoldLeaf connection: 2/2", EMsgType.FAIL); return false; } + logPrinter.print("GL Initiating GoldLeaf connection: 2/2", EMsgType.PASS); + while (true) { readByte = readFromUsb(); if (readByte == null) @@ -606,7 +606,7 @@ public class UsbCommunications extends Task { } logPrinter.print(" [2/4] File #"+i, EMsgType.PASS); if (!writeToUsb(ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(pfsElement.getBodySize()+pfsElement.getNca(i).getNcaOffset()).array())) { // offset. real. - logPrinter.print(" [2/4] File #"+i, EMsgType.FAIL); + logPrinter.print(" [3/4] File #"+i, EMsgType.FAIL); return false; } logPrinter.print(" [3/4] File #"+i, EMsgType.PASS);