hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for updates upon macOS app reopen

Browse Source
This commit is contained in:
SiboVG 2022-09-30 05:07:42 +02:00
parent 68dd2af95d
commit b7d809b568
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swing/src/net/sf/openrocket/startup/OSXSetup.java
View File

@ -7,6 +7,7 @@ import java.awt.desktop.PreferencesHandler;
import java.awt.desktop.QuitHandler; import java.awt.desktop.QuitHandler;
import java.awt.desktop.AppReopenedListener; import java.awt.desktop.AppReopenedListener;
import net.sf.openrocket.communication.UpdateInfoRetriever;
import net.sf.openrocket.gui.util.DummyFrameMenuOSX; import net.sf.openrocket.gui.util.DummyFrameMenuOSX;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -56,6 +57,10 @@ final class OSXSetup {
if (BasicFrame.isFramesEmpty()) { if (BasicFrame.isFramesEmpty()) {
log.info("App re-opened"); log.info("App re-opened");
BasicFrame.reopen(); BasicFrame.reopen();
// Also check for software updates
final UpdateInfoRetriever updateRetriever = SwingStartup.startUpdateChecker();
SwingStartup.checkUpdateStatus(updateRetriever);
} }
}; };

24
swing/src/net/sf/openrocket/startup/SwingStartup.java
View File

@ -193,15 +193,7 @@ public class SwingStartup {
guiModule.startLoader(); guiModule.startLoader();
// Start update info fetching // Start update info fetching
final UpdateInfoRetriever updateRetriever; final UpdateInfoRetriever updateRetriever = startUpdateChecker();
if (Application.getPreferences().getCheckUpdates()) {
log.info("Starting update check");
updateRetriever = new UpdateInfoRetriever();
updateRetriever.startFetchUpdateInfo();
} else {
log.info("Update check disabled");
updateRetriever = null;
}
// Set the best available look-and-feel // Set the best available look-and-feel
log.info("Setting best LAF"); log.info("Setting best LAF");
@ -249,8 +241,20 @@ public class SwingStartup {
} }
public static UpdateInfoRetriever startUpdateChecker() {
final UpdateInfoRetriever updateRetriever;
if (Application.getPreferences().getCheckUpdates()) {
log.info("Starting update check");
updateRetriever = new UpdateInfoRetriever();
updateRetriever.startFetchUpdateInfo();
} else {
log.info("Update check disabled");
updateRetriever = null;
}
return updateRetriever;
}
private void checkUpdateStatus(final UpdateInfoRetriever updateRetriever) { public static void checkUpdateStatus(final UpdateInfoRetriever updateRetriever) {
if (updateRetriever == null) if (updateRetriever == null)
return; return;