Changeset 51bf23a

Timestamp:

Dec 12, 2018 3:17:51 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

9738db7

Parents:

5eda3064

Message:

DTG: Use UrlLauncher? to launch browser

Files:

• apps/desktopgui/build.xml (modified) (1 diff)
• apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java (modified) (3 diffs)
• apps/desktopgui/src/net/i2p/desktopgui/Main.java (modified) (1 diff)
• apps/desktopgui/src/net/i2p/desktopgui/util/BrowseException.java (deleted)
• apps/desktopgui/src/net/i2p/desktopgui/util/I2PDesktop.java (deleted)
• build.xml (modified) (1 diff)

apps/desktopgui/build.xml

@@ -35 +35 @@
                     <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
                     <pathelement location="../../router/java/build/router.jar" />
+                    <pathelement location="../systray/java/build/systray.jar" />
                 </classpath>
             </javac>

apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
+import java.io.IOException;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -13 +13 @@
 import javax.swing.SwingWorker;
 
+import net.i2p.apps.systray.UrlLauncher;
 import net.i2p.data.DataHelper;
 import net.i2p.desktopgui.router.RouterManager;
-import net.i2p.desktopgui.util.BrowseException;
-import net.i2p.desktopgui.util.I2PDesktop;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
@@ -434 +433 @@
      *
      * Modified from I2PTunnelHTTPClientBase.
-     * TODO perhaps move this to a new PortMapper method.
      *
      * @since 0.9.26
      */
     private void launchBrowser() {
+        // null args ok
+        UrlLauncher launcher = new UrlLauncher(_context, null, null);
         String url = _context.portMapper().getConsoleURL();
         try {
-            I2PDesktop.browse(url);
-        } catch (BrowseException e1) {
+            launcher.openUrl(url);
+        } catch (IOException e1) {
             log.log(Log.WARN, "Failed to open browser!", e1);
         }    

apps/desktopgui/src/net/i2p/desktopgui/Main.java

@@ -18 +18 @@
 import static net.i2p.app.ClientAppState.*;
 import net.i2p.desktopgui.router.RouterManager;
-import net.i2p.desktopgui.util.*;
 import net.i2p.router.RouterContext;
 import net.i2p.router.app.RouterApp;

build.xml

@@ -389 +389 @@
     </target>
 
-    <target name="buildDesktopGui" depends="buildCore, buildrouter" >
-<!--
-        <ant dir="apps/desktopgui" target="clean" />
--->
+    <target name="buildDesktopGui" depends="buildCore, buildrouter, buildSystray" >
         <ant dir="apps/desktopgui" target="jar" />
         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />