diff --git a/VERSION.md b/VERSION.md index 90f935f..0cc9529 100644 --- a/VERSION.md +++ b/VERSION.md @@ -12,8 +12,8 @@ noscript 11.4.29 https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi localcdn-fork-of-decentraleyes -2.6.64 -https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi +2.6.65 +https://addons.mozilla.org/firefox/downloads/file/4251866/localcdn_fork_of_decentraleyes-2.6.65.xpi onion-in-container-browsing 0.82 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi @@ -21,8 +21,8 @@ javascript-restrictor 0.17 https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi ublock-origin -1.56.0 -https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi +1.57.0 +https://addons.mozilla.org/firefox/downloads/file/4257361/ublock_origin-1.57.0.xpi ``` ## Chromium @@ -38,7 +38,7 @@ LocalCDN 2.6.65 https://clients2.google.com/service/update2/crx uBlock Origin -1.56.0 +1.57.0 https://clients2.google.com/service/update2/crx __MSG_extensionName__ 0.17 diff --git a/build.xml b/build.xml index 085a155..3c491c0 100755 --- a/build.xml +++ b/build.xml @@ -328,7 +328,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + diff --git a/scripts/build.number b/scripts/build.number index 4012163..3a9283d 100644 --- a/scripts/build.number +++ b/scripts/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Mar 19 18:47:29 EDT 2024 -build.number=717 +#Thu Apr 04 12:21:54 EDT 2024 +build.number=722 diff --git a/src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java b/src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java index e792164..c440e71 100644 --- a/src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java +++ b/src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java @@ -42,8 +42,13 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp { private static final String PROP_DTG_ENABLED = "desktopgui.enabled"; private final File pluginDir; private final File profileDir; - private MenuHandle lmhs; - private MenuHandle lmhf; + private MenuHandle SafeHandleLauncher; + private MenuHandle FlexibleHandleLauncher; + // MenuHandles for app-mode launchers + private MenuHandle ConsoleHandleLauncher; + private MenuHandle SnarkHandleLauncher; + private MenuHandle SusimailHandleLauncher; + private MenuHandle TunnelHanleLauncher; /** * @since 1.4.0 * @return @@ -100,8 +105,8 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp { } catch (InterruptedException ie) { } if (dtg != null) { - dtg.removeMenu(lmhs); - dtg.removeMenu(lmhf); + dtg.removeMenu(SafeHandleLauncher); + dtg.removeMenu(FlexibleHandleLauncher); } } changeState(ClientAppState.STOPPED); @@ -132,14 +137,14 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp { } if (dtg != null) { _log.info("I2P Browser integrating with I2P tray manager"); - lmhs = + SafeHandleLauncher = dtg.addMenu("Launch I2P Browser (Safe Mode)", new Starter(dtg)); - dtg.showMenu(lmhs); - dtg.enableMenu(lmhs); - lmhf = dtg.addMenu("Launch I2P Browser (Flexible Mode)", + dtg.showMenu(SafeHandleLauncher); + dtg.enableMenu(SafeHandleLauncher); + FlexibleHandleLauncher = dtg.addMenu("Launch I2P Browser (Flexible Mode)", new FlexStarter(dtg)); - dtg.showMenu(lmhf); - dtg.enableMenu(lmhf); + dtg.showMenu(FlexibleHandleLauncher); + dtg.enableMenu(FlexibleHandleLauncher); } else { _log.info("I2P Browser tray manager not found"); } @@ -152,6 +157,26 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp { } } + public MenuHandle addMenuHandle(String launchMessage){ + try { + _log.info( + "Starting I2P Browser tray manager by testing http://proxy.i2p"); + MenuService dtg = startTrayApp(); + if (dtg != null) { + _log.info("I2P Browser integrating with I2P tray manager"); + MenuHandle handle = + dtg.addMenu(launchMesssage, new Starter(dtg)); + dtg.showMenu(SafeHandleLauncher); + dtg.enableMenu(SafeHandleLauncher); + return handle; + } else { + _log.info("I2P Browser tray manager not found"); + } + } catch (Exception e) { + _log.error("Error starting I2P Browser tray manager", e); + } + } + // Copied directly from I2PSnark-standalone /** * @since 1.4.0