Skip to content

Commit 0544044

Browse files
committed
Update tsschecker_linux, stop deleting tsschecker every time
1 parent 3065752 commit 0544044

File tree

3 files changed

+13
-23
lines changed

3 files changed

+13
-23
lines changed

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

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static void afterStageShowing() {
121121
@SuppressWarnings("unchecked")
122122
@FXML
123123
public void initialize() {
124-
// create effectd
124+
// create effects
125125
borderGlow.setOffsetY(0f);
126126
borderGlow.setOffsetX(0f);
127127
borderGlow.setColor(Color.DARKCYAN);
@@ -230,9 +230,7 @@ private void requireBoardConfig(String newValue) {
230230
}
231231
}
232232

233-
public void checkForUpdatesHandler() {
234-
checkForUpdates(true);
235-
}
233+
public void checkForUpdatesHandler() { checkForUpdates(true); }
236234

237235
private void run(String device) {
238236
if ("".equals(device)) {
@@ -246,7 +244,6 @@ private void run(String device) {
246244
newReportableError("There was an error creating tsschecker.", e.getMessage());
247245
return;
248246
}
249-
tsschecker.deleteOnExit();
250247

251248
File locationToSaveBlobs = new File(pathField.getText());
252249
//noinspection ResultOfMethodCallIgnored
@@ -264,7 +261,6 @@ private void run(String device) {
264261
try {
265262
if (!ipswField.getText().matches("https?://.*apple.*\\.ipsw")) {
266263
newUnreportableError("\"" + ipswField.getText() + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
267-
deleteTempFiles(tsschecker, null);
268264
return;
269265
}
270266
buildManifestPlist = File.createTempFile("BuildManifest", ".plist");
@@ -274,7 +270,7 @@ private void run(String device) {
274270
zin = new ZipInputStream(url.openStream());
275271
} catch (IOException e) {
276272
newUnreportableError("\"" + ipswField.getText() + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
277-
deleteTempFiles(tsschecker, buildManifestPlist);
273+
deleteTempFiles(buildManifestPlist);
278274
return;
279275
}
280276
ZipEntry ze;
@@ -288,7 +284,7 @@ private void run(String device) {
288284
} catch (IOException e) {
289285
newReportableError("Unable to get BuildManifest from .ipsw.", e.getMessage());
290286
e.printStackTrace();
291-
deleteTempFiles(tsschecker, buildManifestPlist);
287+
deleteTempFiles(buildManifestPlist);
292288
return;
293289
}
294290
Collections.addAll(args, "-i", versionField.getText(), "--beta", "--buildid", buildIDField.getText(), "-m", buildManifestPlist.toString());
@@ -302,7 +298,7 @@ private void run(String device) {
302298
} catch (IOException e) {
303299
newReportableError("There was an error starting tsschecker.", e.toString());
304300
e.printStackTrace();
305-
deleteTempFiles(tsschecker, buildManifestPlist);
301+
deleteTempFiles(buildManifestPlist);
306302
return;
307303
}
308304

@@ -367,20 +363,13 @@ private void run(String device) {
367363
} else {
368364
newReportableError("Unknown result.\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.", tsscheckerLog);
369365
}
370-
371-
deleteTempFiles(tsschecker, buildManifestPlist);
366+
deleteTempFiles(buildManifestPlist);
372367
}
373368

374369
@SuppressWarnings("ResultOfMethodCallIgnored")
375-
private static void deleteTempFiles(File tsschecker, File buildManifestPlist) {
376-
try {
377-
if (tsschecker.exists()) {
378-
tsschecker.delete();
379-
}
380-
if (buildManifestPlist != null && buildManifestPlist.exists()) {
381-
buildManifestPlist.delete();
382-
}
383-
} catch (NullPointerException ignored) {
370+
private static void deleteTempFiles(File buildManifestPlist) {
371+
if (buildManifestPlist != null && buildManifestPlist.exists()) {
372+
buildManifestPlist.delete();
384373
}
385374
}
386375

@@ -606,9 +595,7 @@ public void savePresetHandler() {
606595
}
607596
}
608597

609-
public void checkBlobs() {
610-
openURL("https://tsssaver.1conan.com/check.php");
611-
}
598+
public void checkBlobs() { openURL("https://tsssaver.1conan.com/check.php"); }
612599

613600
public void helpLabelHandler(MouseEvent evt) {
614601
String labelID;

src/main/java/com/airsquared/blobsaver/Shared.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ static File getTsschecker() throws IOException {
155155
if (tsschecker.exists() && appPrefs.getBoolean("tsschecker last update v2.2.3", false)) {
156156
return tsschecker;
157157
} else {
158+
if (tsschecker.exists()) {
159+
tsschecker.delete();
160+
}
158161
InputStream input;
159162
if (PlatformUtil.isMac()) {
160163
input = Shared.class.getResourceAsStream("tsschecker_macos");
4.1 MB
Binary file not shown.

0 commit comments

Comments
 (0)