Skip to content

Commit 3ceb4f5

Browse files
airsquaredairsquared
committed
Update some messages in the app
1 parent 718dcac commit 3ceb4f5

File tree

8 files changed

+31
-27
lines changed

8 files changed

+31
-27
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ assignees: ''
77

88
---
99

10-
YOUR ISSUE WILL BE CLOSED AND/OR DELETED IF YOU DO NOT FILL OUT THIS TEMPLATE
11-
10+
Your issue will be closed and/or deleted if you do not fill out this template.
1211

1312
Please remove the following line and the text above it before submitting this issue:
1413

‎.github/ISSUE_TEMPLATE/question.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ assignees: ''
77

88
---
99

10-
DO NOT SUBMIT A BUG REPORT OR FEATURE REQUEST USING THIS TEMPLATE, YOUR ISSUE WILL BE CLOSED AND/OR DELETED
10+
Please do not submit a bug report or feature request using this template, your issue will be closed and/or deleted.
1111

12-
13-
Please remove the following line and the text above it before submitting this issue:
12+
Remove the following line and the text above it before submitting this issue:
1413

1514
-------------------------------------------------------------

‎.idea/saveactions_settings.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
Help support this project by ⭐️'ing it! [Donations](https://www.paypal.me/airsqrd) also appreciated!
22

33
# blobsaver [![GitHub All Releases](https://img.shields.io/github/downloads/airsquared/blobsaver/total.svg)](https://github.com/airsquared/blobsaver/releases) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/0d4fdc1daca5402a8c57efc3bef73d31)](https://www.codacy.com/gh/airsquared/blobsaver/dashboard?utm_source=github.com&utm_medium=referral&utm_content=airsquared/blobsaver&utm_campaign=Badge_Grade)
4-
A GUI for saving SHSH blobs using [tsschecker](https://github.com/tihmstar/tsschecker). Supports macOS, Windows, and Linux.
4+
A GUI for saving SHSH blobs using [tsschecker](https://github.com/tihmstar/tsschecker). Supports macOS, Windows, and
5+
Linux.
56

6-
[Download here](https://github.com/airsquared/blobsaver/releases) (Requires [Java](https://java.com/en/download/manual.jsp))
7+
[Download here](https://github.com/airsquared/blobsaver/releases) (
8+
Requires [Java](https://java.com/en/download/manual.jsp), not required for the v3.0 beta)
79

8-
**Tip:** if you want blobs you save to automatically be uploaded to the cloud, see [here](https://github.com/airsquared/blobsaver/wiki/Automatically-saving-blobs-to-the-cloud).
10+
**Tip:** if you want blobs you save to automatically be uploaded to the cloud,
11+
see [here](https://github.com/airsquared/blobsaver/wiki/Automatically-saving-blobs-to-the-cloud).
912

1013
![Mac Screenshot](.github/screenshots/screenshot-macos.png)
1114
![Windows Screenshot](.github/screenshots/screenshot-windows.png)

‎src/main/java/airsquared/blobsaver/app/Controller.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,10 @@ public void forceCheckForBlobsHandler() {
438438
}
439439

440440
public void resetAppHandler() {
441-
ButtonType result = Utils.showConfirmAlert("Are you sure you would like to reset/remove all blobsaver data?");
441+
ButtonType result = Utils.showConfirmAlert("Are you sure you would like to clear all blobsaver data?");
442442
if (ButtonType.OK.equals(result)) {
443443
Prefs.resetPrefs();
444-
Utils.showInfoAlert("The application data have been removed. \nThe application will now exit.");
444+
Utils.showInfoAlert("The application data has been removed. \nThe application will now exit.");
445445
Main.exit();
446446
}
447447
}
@@ -514,17 +514,17 @@ public void readInfo() {
514514

515515
public void readApnonce() {
516516
Alert alert1 = new Alert(Alert.AlertType.CONFIRMATION, "", ButtonType.CANCEL, new ButtonType("Jailbroken"), new ButtonType("Unjailbroken"));
517-
alert1.setHeaderText("Read apnonce from connected device");
518-
alert1.setContentText("blobsaver can read both the ApNonce and generator from a connected device.\n\n" +
519-
"Please connect your device and click \"Jailbroken\" if your device has a generator set or \"Unjailbroken\" if you don't. Your device will enter recovery mode while retrieving the apnonce and will automatically reboot to normal mode when complete.\n\n");
517+
alert1.setHeaderText("Read APNonce from connected device");
518+
alert1.setContentText("blobsaver can read both the APNonce and generator from a connected device.\n\n" +
519+
"Please connect your device and click \"Jailbroken\" if your device has a generator set or \"Unjailbroken\" if you don't. Your device will enter recovery mode while retrieving the APNonce and will automatically reboot to normal mode when complete.\n\n");
520520
boolean jailbroken;
521521
if (alert1.showAndWait().isEmpty() || !alert1.getResult().getText().contains("ailbroken")) {
522522
return;
523523
} else {
524524
jailbroken = alert1.getResult().getText().equals("Jailbroken");
525525
}
526526
final Alert alert2 = new Alert(Alert.AlertType.INFORMATION, "[This should not be visible]", ButtonType.FINISH);
527-
alert2.setHeaderText("Reading apnonce from connected device...");
527+
alert2.setHeaderText("Reading APNonce from connected device...");
528528
Utils.forEachButton(alert2, button -> button.setDisable(true));
529529

530530
LibimobiledeviceUtil.GetApnonceTask task = LibimobiledeviceUtil.createApnonceTask(jailbroken);
@@ -641,7 +641,7 @@ private void parseException(Throwable t) {
641641
ipswField.setEffect(Utils.errorBorder);
642642
} else if (message.contains("not a valid ECID")) {
643643
ecidField.setEffect(Utils.errorBorder);
644-
} else if (message.contains("not a valid apnonce")) {
644+
} else if (message.contains("not a valid APNonce")) {
645645
apnonceField.setEffect(Utils.errorBorder);
646646
} else if (message.contains("not a valid path")) {
647647
pathField.setEffect(Utils.errorBorder);

‎src/main/java/airsquared/blobsaver/app/LibimobiledeviceUtil.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ private GetApnonceTask(boolean jailbroken) {
8989
@Override
9090
protected Void call() throws LibimobiledeviceException {
9191
if (!jailbroken) {
92-
updateMessage("Reading ApNonce in normal mode...");
92+
updateMessage("Reading APNonce in normal mode...");
9393
System.out.println("Read in normal mode: " + LibimobiledeviceUtil.getApNonceNormalMode());
9494
}
9595
updateMessage("Entering recovery mode...\n\nThis can take up to 60 seconds");
9696
LibimobiledeviceUtil.enterRecovery();
9797
PointerByReference irecvClient = waitForRecovery();
9898
if (irecvClient == null) return null;
9999

100-
updateMessage("Reading ApNonce...");
100+
updateMessage("Reading APNonce...");
101101
apnonceResult = getApnonce(irecvClient.getValue());
102102
Libirecovery.sendCommand(irecvClient.getValue(), "reset");
103103

@@ -106,9 +106,9 @@ protected Void call() throws LibimobiledeviceException {
106106
if (irecvClient == null) return null;
107107

108108
if (apnonceResult.equals(getApnonce(irecvClient.getValue()))) {
109-
Utils.runSafe(() -> updateMessage("Successfully got ApNonce, exiting recovery mode..."));
109+
Utils.runSafe(() -> updateMessage("Successfully got APNonce, exiting recovery mode..."));
110110
} else {
111-
Utils.runSafe(() -> updateMessage("Warning: Got ApNonce, but two successive reads didn't match. This could mean the generator wasn't set correctly.\n\nExiting recovery mode..."));
111+
Utils.runSafe(() -> updateMessage("Warning: Got APNonce, but two successive reads didn't match. This could mean the generator wasn't set correctly.\n\nExiting recovery mode..."));
112112
}
113113

114114
LibimobiledeviceUtil.exitRecovery(irecvClient.getValue());
@@ -319,19 +319,21 @@ private static void throwIfNeeded(int errorCode, ErrorCodeType errorType) throws
319319
boolean reportableError = false;
320320
if (errorType.equals(ErrorCodeType.idevice_error)) {
321321
if (errorCode == -3) { // IDEVICE_E_NO_DEVICE
322-
message = "Error: No devices found/connected. Make sure your device is connected via USB and unlocked.";
322+
message = "No devices found/connected. Make sure your device is connected via USB and unlocked.";
323323
} else {
324324
message = "idevice error: code=" + errorCode;
325325
reportableError = true;
326326
}
327327
} else if (errorType.equals(ErrorCodeType.lockdownd_error)) {
328328
message = switch (errorCode) {
329329
case -17: // LOCKDOWN_E_PASSWORD_PROTECTED
330-
yield "Error: The device is locked.\n\nPlease unlock your device and go to the homescreen then try again.\n\nLOCKDOWN_E_PASSWORD_PROTECTED (-17)";
330+
yield "The device is locked.\n\nPlease unlock your device and go to the homescreen then try again.\n\nLOCKDOWN_E_PASSWORD_PROTECTED (-17)";
331331
case -18: // LOCKDOWN_E_USER_DENIED_PAIRING
332-
yield "Error: The user denied the pair request on the device. Please unplug your device and accept the dialog next time.\n\nLOCKDOWN_E_USER_DENIED_PAIRING (-18)";
332+
yield "The user denied the pair request on the device. Please unplug your device and accept the dialog next time.\n\nLOCKDOWN_E_USER_DENIED_PAIRING (-18)";
333333
case -19: // LOCKDOWN_E_PAIRING_DIALOG_RESPONSE_PENDING
334-
yield "Error: Please accept the trust/pair dialog on the device and try again.\n\nLOCKDOWN_E_PAIRING_DIALOG_RESPONSE_PENDING (-19)";
334+
yield "Please accept the trust/pair dialog on the device and try again.\n\nLOCKDOWN_E_PAIRING_DIALOG_RESPONSE_PENDING (-19)";
335+
case -21: // LOCKDOWN_E_INVALID_HOST_ID
336+
yield "Try restarting both your iOS device and computer. If that doesn't work, try again with your device open and trusted in Finder/iTunes.\n\nLOCKDOWN_E_INVALID_HOST_ID (-21)";
335337
case -8: // LOCKDOWN_E_MUX_ERROR
336338
reportableError = true;
337339
yield "lockdownd error: LOCKDOWN_E_MUX_ERROR (-8)";

‎src/main/java/airsquared/blobsaver/app/TSS.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private void parseTSSLog(String tsscheckerLog) throws TSSException {
186186
throw new TSSException("\"" + ecid + "\"" + " is not a valid ECID. Try using the 'Read from device' button.", false);
187187
} else if (containsIgnoreCase(tsscheckerLog, "[Error] [TSSC] manually specified ApNonce=" + apnonce + ", but parsing failed")
188188
|| containsIgnoreCase(tsscheckerLog, "[Error] [TSSR] parsed APNoncelen != requiredAPNoncelen")) {
189-
throw new TSSException("\"" + apnonce + "\" is not a valid apnonce", false);
189+
throw new TSSException("\"" + apnonce + "\" is not a valid APNonce", false);
190190
} else if (containsIgnoreCase(tsscheckerLog, "could not get BuildIdentity for installType=Erase")
191191
&& containsIgnoreCase(tsscheckerLog, "could not get BuildIdentity for installType=Update")
192192
&& containsIgnoreCase(tsscheckerLog, "checking tss status failed")) {

‎src/main/resources/airsquared/blobsaver/app/blobsaver.fxml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@
190190
</VBox.margin>
191191
</TextField>
192192
<CheckBox fx:id="apnonceCheckBox" mnemonicParsing="false" onAction="#apnonceCheckBoxHandler"
193-
text="Specify ApNonce:">
193+
text="Specify APNonce:">
194194
<VBox.margin>
195195
<Insets bottom="5.0" left="10.0" top="5.0"/>
196196
</VBox.margin>
197197
</CheckBox>
198198
<AnchorPane disable="${!apnonceCheckBox.selected}">
199-
<TextField fx:id="apnonceField" promptText="Apnonce" AnchorPane.bottomAnchor="0.0"
199+
<TextField fx:id="apnonceField" promptText="APNonce" AnchorPane.bottomAnchor="0.0"
200200
onTextChange="#clearEffectHandler"
201201
AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
202202
<padding>
@@ -271,7 +271,7 @@
271271
</ListView>
272272
<!--suppress JavaFxUnresolvedFxIdReference -->
273273
<Button fx:id="saveDeviceButton" prefWidth="Infinity" maxWidth="Infinity" mnemonicParsing="false"
274-
onAction="#saveDeviceHandler" text="Save" disable="${backgroundSettingsButton.selected}"
274+
onAction="#saveDeviceHandler" text="Save Device" disable="${backgroundSettingsButton.selected}"
275275
visible="${!saveDeviceButton.disable}" managed="${!saveDeviceButton.disable}">
276276
<VBox.margin>
277277
<Insets bottom="10.0"/>

0 commit comments

Comments
 (0)