From 15664976dd4dd192ea23f8a0437eb0021c2f6dbe Mon Sep 17 00:00:00 2001
From: Sibo Van Gool <sibo.vangool@hotmail.com>
Date: Thu, 27 Jan 2022 16:38:41 +0100
Subject: [PATCH] [fixes #825] Add 'Install update' option to UpdateInfoDialog
 This lets the user download an asset file, based on the option selected in
 the comboBox (e.g. 'Mac OS')

---
 core/resources/l10n/messages.properties       |  2 +
 .../gui/dialogs/UpdateInfoDialog.java         | 49 +++++++++++++++++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 529eaa404..76aeeccad 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -343,6 +343,8 @@ update.dlg.updateAvailable.txtPane.title = OpenRocket version %s available!
 update.dlg.updateAvailable.txtPane.yourVersion = Your current version: %s
 update.dlg.updateAvailable.txtPane.changelog = Changelog
 update.dlg.updateAvailable.txtPane.readMore = Read more on GitHub
+update.dlg.updateAvailable.but.install = Install update
+update.dlg.updateAvailable.combo.noDownloads = No downloads available
 update.fetcher.badResponse = Bad response code from server: %d
 update.fetcher.badConnection = Could not connect to the GitHub server. Please check your internet connection.
 update.fetcher.malformedURL = Malformed URL: %s
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
index 5c1b0c058..024c18ded 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
@@ -4,9 +4,13 @@ import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -16,6 +20,7 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.communication.AssetHandler;
 import net.sf.openrocket.communication.ReleaseInfo;
 import net.sf.openrocket.communication.UpdateInfo;
 import net.sf.openrocket.gui.util.GUIUtil;
@@ -24,6 +29,7 @@ import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.gui.widgets.SelectColorButton;
+import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.BuildProperties;
 import net.sf.openrocket.util.MarkdownUtil;
 import org.slf4j.Logger;
@@ -105,16 +111,51 @@ public class UpdateInfoDialog extends JDialog {
 			}
 		});
 		panel.add(checkAtStartup);
+
+		// Install operating system combo box
+		List<String> assetURLs = release.getAssetURLs();
+		Map<String, String> mappedAssets = AssetHandler.mapURLToOSName(assetURLs);
+		JComboBox<String> comboBox;
+		if (mappedAssets == null || mappedAssets.size() == 0) {
+			comboBox = new JComboBox<>(new String[]{
+					String.format("- %s -", trans.get("update.dlg.updateAvailable.combo.noDownloads"))});
+		}
+		else {
+			comboBox = new JComboBox<>(mappedAssets.keySet().toArray(new String[0]));
+		}
+		panel.add(comboBox, "pushx, right");
+		String os = AssetHandler.getOSName();
+		comboBox.setSelectedItem(os);
+
+		// Install update button
+		JButton btnInstall = new SelectColorButton(trans.get("update.dlg.updateAvailable.but.install"));
+		btnInstall.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (mappedAssets == null) return;
+				String url = mappedAssets.get((String) comboBox.getSelectedItem());
+				Desktop desktop = Desktop.getDesktop();
+				try {
+					desktop.browse(new URI(url));
+				} catch (Exception ex) {
+					log.warn("Exception install link: " + ex.getMessage());
+				}
+			}
+		});
+		if (mappedAssets == null || mappedAssets.size() == 0) {
+			btnInstall.setEnabled(false);
+		}
+		panel.add(btnInstall, "gapright 20");
 		
 		// Cancel button
-		JButton button = new SelectColorButton(trans.get("button.cancel"));
-		button.addActionListener(new ActionListener() {
+		JButton btnCancel = new SelectColorButton(trans.get("button.cancel"));
+		btnCancel.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				UpdateInfoDialog.this.dispose();
 			}
 		});
-		panel.add(button, "right, gapright para");
+		panel.add(btnCancel);
 
 		panel.setPreferredSize(new Dimension(900, 600));
 
@@ -122,7 +163,7 @@ public class UpdateInfoDialog extends JDialog {
 		
 		this.pack();
 		this.setLocationRelativeTo(null);
-		GUIUtil.setDisposableDialogOptions(this, button);
+		GUIUtil.setDisposableDialogOptions(this, btnCancel);
 	}
 	
 }