Skip to content

Commit caae074

Browse files
airsquaredairsquared
committed
Save apnonces in presets
1 parent d9a4fbe commit caae074

File tree

2 files changed

+38
-28
lines changed

2 files changed

+38
-28
lines changed

‎src/main/java/com/airsquared/blobsaver/Background.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.io.IOException;
4040
import java.net.URL;
4141
import java.util.ArrayList;
42+
import java.util.Collections;
4243
import java.util.List;
4344
import java.util.Map;
4445
import java.util.concurrent.Executors;
@@ -223,6 +224,7 @@ private static void saveBackgroundBlobs(int preset) {
223224
String ecid = presetPrefs.get("ECID", "");
224225
String path = presetPrefs.get("Path", "");
225226
String boardConfig = presetPrefs.get("Board Config", "");
227+
String apnonce = presetPrefs.get("Apnonce", "");
226228
for (String version : versionsToSave) {
227229
File tsschecker;
228230
try {
@@ -249,13 +251,16 @@ private static void saveBackgroundBlobs(int preset) {
249251
new File(path).mkdirs();
250252
String tsscheckerLog;
251253
try {
254+
ArrayList<String> args = new ArrayList<>();
255+
Collections.addAll(args, tsschecker.getPath(), "--generator", "0x1111111111111111", "--nocache", "-d", identifier, "-s", "-e", ecid,
256+
"--save-path", path, "-i", version);
252257
if (!"none".equals(boardConfig) && !"".equals(boardConfig)) { // needs board config
253-
tsscheckerLog = executeProgram(tsschecker.getPath(), "--generator", "0x1111111111111111", "--nocache", "-d", identifier, "-s", "-e", ecid,
254-
"--save-path", path, "-i", version, "--boardconfig", boardConfig);
255-
} else {
256-
tsscheckerLog = executeProgram(tsschecker.getPath(), "--generator", "0x1111111111111111", "--nocache", "-d", identifier, "-s", "-e", ecid,
257-
"--save-path", path, "-i", version);
258+
Collections.addAll(args, "--boardconfig", boardConfig);
258259
}
260+
if (!"".equals(apnonce)) {
261+
Collections.addAll(args, "--apnonce", apnonce);
262+
}
263+
tsscheckerLog = executeProgram(args.toArray(new String[0]));
259264
} catch (IOException e) {
260265
Notification notification = new Notification("Saving blobs failed", "There was an error starting tsschecker. Click here to report this error.", Notification.ERROR_ICON);
261266
Notification.Notifier.INSTANCE.setPopupLifetime(Duration.minutes(1));

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

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,16 @@ private void loadPreset(int preset) {
478478
if (!"none".equals(prefs.get("Board Config", ""))) {
479479
boardConfigField.setText(prefs.get("Board Config", ""));
480480
}
481+
if (!"".equals(prefs.get("Apnonce", ""))) {
482+
if (!apnonceCheckBox.isSelected()) {
483+
apnonceCheckBox.fire();
484+
}
485+
apnonceField.setText(prefs.get("Apnonce", ""));
486+
} else {
487+
if (apnonceCheckBox.isSelected()) {
488+
apnonceCheckBox.fire();
489+
}
490+
}
481491
}
482492

483493
private void presetButtonHandler(ActionEvent evt) {
@@ -520,22 +530,14 @@ private void presetButtonHandler(ActionEvent evt) {
520530
@SuppressWarnings("Duplicates")
521531
private void savePreset(int preset) {
522532
boolean doReturn = false;
523-
if ("".equals(ecidField.getText())) {
524-
ecidField.setEffect(errorBorder);
525-
doReturn = true;
526-
}
527533
if (!identifierCheckBox.isSelected() && "".equals(deviceModelChoiceBox.getValue())) {
528534
deviceModelChoiceBox.setEffect(errorBorder);
529535
doReturn = true;
530536
}
531-
if (identifierCheckBox.isSelected() && "".equals(identifierField.getText())) {
532-
identifierField.setEffect(errorBorder);
533-
doReturn = true;
534-
}
535-
if (getBoardConfig && "".equals(boardConfigField.getText())) {
536-
boardConfigField.setEffect(errorBorder);
537-
doReturn = true;
538-
}
537+
doReturn = doReturn || isTextFieldInvalid(true, ecidField);
538+
doReturn = doReturn || isTextFieldInvalid(identifierCheckBox, identifierField);
539+
doReturn = doReturn || isTextFieldInvalid(getBoardConfig, boardConfigField);
540+
doReturn = doReturn || isTextFieldInvalid(apnonceCheckBox, apnonceField);
539541
if (doReturn) {
540542
return;
541543
}
@@ -570,6 +572,9 @@ private void savePreset(int preset) {
570572
} else {
571573
presetPrefs.put("Board Config", "none");
572574
}
575+
if (apnonceCheckBox.isSelected()) {
576+
presetPrefs.put("Apnonce", apnonceField.getText());
577+
}
573578
}
574579

575580
public void savePresetHandler() {
@@ -1201,14 +1206,14 @@ public void goButtonHandler() {
12011206
deviceModelChoiceBox.setEffect(errorBorder);
12021207
doReturn = true;
12031208
}
1204-
doReturn = doReturn || isTextFieldValid(true, ecidField);
1205-
doReturn = doReturn || isTextFieldValid(identifierCheckBox, identifierField);
1206-
doReturn = doReturn || isTextFieldValid(getBoardConfig, boardConfigField);
1207-
doReturn = doReturn || isTextFieldValid(apnonceCheckBox, apnonceField);
1208-
doReturn = doReturn || isTextFieldValid(true, pathField);
1209-
doReturn = doReturn || isTextFieldValid(!versionCheckBox.isSelected(), versionField);
1210-
doReturn = doReturn || isTextFieldValid(betaCheckBox, buildIDField);
1211-
doReturn = doReturn || isTextFieldValid(betaCheckBox, ipswField);
1209+
doReturn = doReturn || isTextFieldInvalid(true, ecidField);
1210+
doReturn = doReturn || isTextFieldInvalid(identifierCheckBox, identifierField);
1211+
doReturn = doReturn || isTextFieldInvalid(getBoardConfig, boardConfigField);
1212+
doReturn = doReturn || isTextFieldInvalid(apnonceCheckBox, apnonceField);
1213+
doReturn = doReturn || isTextFieldInvalid(true, pathField);
1214+
doReturn = doReturn || isTextFieldInvalid(!versionCheckBox.isSelected(), versionField);
1215+
doReturn = doReturn || isTextFieldInvalid(betaCheckBox, buildIDField);
1216+
doReturn = doReturn || isTextFieldInvalid(betaCheckBox, ipswField);
12121217
if (doReturn) {
12131218
return;
12141219
}
@@ -1230,11 +1235,11 @@ public void goButtonHandler() {
12301235
}
12311236
}
12321237

1233-
private static boolean isTextFieldValid(CheckBox checkBox, TextField textField) {
1234-
return isTextFieldValid(checkBox.isSelected(), textField);
1238+
private static boolean isTextFieldInvalid(CheckBox checkBox, TextField textField) {
1239+
return isTextFieldInvalid(checkBox.isSelected(), textField);
12351240
}
12361241

1237-
private static boolean isTextFieldValid(boolean isTextFieldRequired, TextField textField) {
1242+
private static boolean isTextFieldInvalid(boolean isTextFieldRequired, TextField textField) {
12381243
if (isTextFieldRequired && "".equals(textField.getText())) {
12391244
textField.setEffect(errorBorder);
12401245
return true;

0 commit comments

Comments
 (0)