I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit bf1fa061 authored by zzz's avatar zzz
Browse files

DTG: Use actual console URL 

Hide browse menu item if not supported
parent 16cee2ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
+ 90
− 46
View file @ bf1fa061
package net.i2p.desktopgui; package net.i2p.desktopgui;
import java.awt.Desktop;
import java.awt.Desktop.Action;
import java.awt.MenuItem; import java.awt.MenuItem;
import java.awt.PopupMenu; import java.awt.PopupMenu;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
...@@ -15,6 +17,7 @@ import net.i2p.desktopgui.util.BrowseException; ...@@ -15,6 +17,7 @@ import net.i2p.desktopgui.util.BrowseException;
import net.i2p.desktopgui.util.I2PDesktop; import net.i2p.desktopgui.util.I2PDesktop;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.PortMapper;
/** /**
* java -cp i2p.jar:router.jar:desktopgui.jar net.i2p.desktopgui.Main * java -cp i2p.jar:router.jar:desktopgui.jar net.i2p.desktopgui.Main
...@@ -28,6 +31,9 @@ class InternalTrayManager extends TrayManager { ...@@ -28,6 +31,9 @@ class InternalTrayManager extends TrayManager {
private MenuItem _restartItem, _stopItem, _cancelItem; private MenuItem _restartItem, _stopItem, _cancelItem;
private JMenuItem _jrestartItem, _jstopItem, _jcancelItem; private JMenuItem _jrestartItem, _jstopItem, _jcancelItem;
private static final boolean CONSOLE_ENABLED = Desktop.isDesktopSupported() &&
Desktop.getDesktop().isSupported(Action.BROWSE);
public InternalTrayManager(RouterContext ctx, Main main, boolean useSwing) { public InternalTrayManager(RouterContext ctx, Main main, boolean useSwing) {
super(ctx, main, useSwing); super(ctx, main, useSwing);
_context = ctx; _context = ctx;
...@@ -37,27 +43,28 @@ class InternalTrayManager extends TrayManager { ...@@ -37,27 +43,28 @@ class InternalTrayManager extends TrayManager {
public PopupMenu getMainMenu() { public PopupMenu getMainMenu() {
PopupMenu popup = new PopupMenu(); PopupMenu popup = new PopupMenu();
MenuItem browserLauncher = new MenuItem(_t("Launch I2P Browser")); MenuItem browserLauncher;
browserLauncher.addActionListener(new ActionListener() { if (CONSOLE_ENABLED) {
@Override browserLauncher = new MenuItem(_t("Launch I2P Browser"));
public void actionPerformed(ActionEvent arg0) { browserLauncher.addActionListener(new ActionListener() {
new SwingWorker<Object, Object>() { @Override
@Override public void actionPerformed(ActionEvent arg0) {
protected Object doInBackground() throws Exception { new SwingWorker<Object, Object>() {
return null; @Override
} protected Object doInBackground() throws Exception {
return null;
@Override }
protected void done() {
try { @Override
I2PDesktop.browse("http://localhost:7657"); protected void done() {
} catch (BrowseException e1) { launchBrowser();
log.log(Log.WARN, "Failed to open browser!", e1); }
} }.execute();
} }
}.execute(); });
} } else {
}); browserLauncher = null;
}
PopupMenu desktopguiConfigurationLauncher = new PopupMenu(_t("Configure I2P System Tray")); PopupMenu desktopguiConfigurationLauncher = new PopupMenu(_t("Configure I2P System Tray"));
MenuItem configSubmenu = new MenuItem(_t("Disable")); MenuItem configSubmenu = new MenuItem(_t("Disable"));
...@@ -154,8 +161,10 @@ class InternalTrayManager extends TrayManager { ...@@ -154,8 +161,10 @@ class InternalTrayManager extends TrayManager {
} }
}); });
popup.add(browserLauncher); if (CONSOLE_ENABLED) {
popup.addSeparator(); popup.add(browserLauncher);
popup.addSeparator();
}
desktopguiConfigurationLauncher.add(configSubmenu); desktopguiConfigurationLauncher.add(configSubmenu);
popup.add(desktopguiConfigurationLauncher); popup.add(desktopguiConfigurationLauncher);
popup.addSeparator(); popup.addSeparator();
...@@ -177,27 +186,28 @@ class InternalTrayManager extends TrayManager { ...@@ -177,27 +186,28 @@ class InternalTrayManager extends TrayManager {
public JPopupMenu getSwingMainMenu() { public JPopupMenu getSwingMainMenu() {
JPopupMenu popup = new JPopupMenu(); JPopupMenu popup = new JPopupMenu();
JMenuItem browserLauncher = new JMenuItem(_t("Launch I2P Browser")); JMenuItem browserLauncher;
browserLauncher.addActionListener(new ActionListener() { if (CONSOLE_ENABLED) {
@Override browserLauncher = new JMenuItem(_t("Launch I2P Browser"));
public void actionPerformed(ActionEvent arg0) { browserLauncher.addActionListener(new ActionListener() {
new SwingWorker<Object, Object>() { @Override
@Override public void actionPerformed(ActionEvent arg0) {
protected Object doInBackground() throws Exception { new SwingWorker<Object, Object>() {
return null; @Override
} protected Object doInBackground() throws Exception {
return null;
@Override }
protected void done() {
try { @Override
I2PDesktop.browse("http://localhost:7657"); protected void done() {
} catch (BrowseException e1) { launchBrowser();
log.log(Log.WARN, "Failed to open browser!", e1); }
} }.execute();
} }
}.execute(); });
} } else {
}); browserLauncher = null;
}
JMenu desktopguiConfigurationLauncher = new JMenu(_t("Configure I2P System Tray")); JMenu desktopguiConfigurationLauncher = new JMenu(_t("Configure I2P System Tray"));
JMenuItem configSubmenu = new JMenuItem(_t("Disable")); JMenuItem configSubmenu = new JMenuItem(_t("Disable"));
...@@ -294,8 +304,10 @@ class InternalTrayManager extends TrayManager { ...@@ -294,8 +304,10 @@ class InternalTrayManager extends TrayManager {
} }
}); });
popup.add(browserLauncher); if (CONSOLE_ENABLED) {
popup.addSeparator(); popup.add(browserLauncher);
popup.addSeparator();
}
desktopguiConfigurationLauncher.add(configSubmenu); desktopguiConfigurationLauncher.add(configSubmenu);
popup.add(desktopguiConfigurationLauncher); popup.add(desktopguiConfigurationLauncher);
popup.addSeparator(); popup.addSeparator();
...@@ -351,4 +363,36 @@ class InternalTrayManager extends TrayManager { ...@@ -351,4 +363,36 @@ class InternalTrayManager extends TrayManager {
log.error("Error saving config", ex); log.error("Error saving config", ex);
} }
} }
/**
* Build the console URL with info from the port mapper,
* and launch the browser at it.
*
* Modified from I2PTunnelHTTPClientBase.
* TODO perhaps move this to a new PortMapper method.
*
* @since 0.9.26
*/
private void launchBrowser() {
String unset = "*unset*";
PortMapper pm = _context.portMapper();
String httpHost = pm.getActualHost(PortMapper.SVC_CONSOLE, unset);
String httpsHost = pm.getActualHost(PortMapper.SVC_HTTPS_CONSOLE, unset);
int httpPort = pm.getPort(PortMapper.SVC_CONSOLE, 7657);
int httpsPort = pm.getPort(PortMapper.SVC_HTTPS_CONSOLE, -1);
boolean httpsOnly = httpsPort > 0 && httpHost.equals(unset) && !httpsHost.equals(unset);
String url;
if (httpsOnly) {
url = "https://" + httpsHost + ':' + httpsPort + '/';
} else {
if (httpHost.equals(unset))
httpHost = "127.0.0.1";
url = "http://" + httpHost + ':' + httpPort + '/';
}
try {
I2PDesktop.browse(url);
} catch (BrowseException e1) {
log.log(Log.WARN, "Failed to open browser!", e1);
}
}
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]