Version 1.4.0

This commit is contained in:
eyedeekay
2024-03-07 20:47:18 -05:00
parent ff19ea685b
commit 89cff0c444
3 changed files with 65 additions and 18 deletions

View File

@ -40,42 +40,42 @@ jobs:
- name: Upload Firefox Profile Strict - name: Upload Firefox Profile Strict
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2p.firefox.base.profile-${{ github.sha }}.zip name: i2p.firefox.base.profile.zip
path: ./src/i2p.firefox.base.profile.zip path: ./src/i2p.firefox.base.profile.zip
- name: Upload Firefox Profile Usability - name: Upload Firefox Profile Usability
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2p.firefox.usability.profile-${{ github.sha }}.zip name: i2p.firefox.usability.profile.zip
path: ./src/i2p.firefox.usability.profile.zip path: ./src/i2p.firefox.usability.profile.zip
- name: Upload Chromium Profile Strict - name: Upload Chromium Profile Strict
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2p.chromium.base.profile-${{ github.sha }}.zip name: i2p.chromium.base.profile.zip
path: ./src/i2p.chromium.base.profile.zip path: ./src/i2p.chromium.base.profile.zip
- name: Upload Chromium Profile Usability - name: Upload Chromium Profile Usability
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2p.chromium.usability.profile-${{ github.sha }}.zip name: i2p.chromium.usability.profile.zip
path: ./src/i2p.chromium.usability.profile.zip path: ./src/i2p.chromium.usability.profile.zip
- name: Upload i2pfirefox.jar - name: Upload i2pfirefox.jar
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pfirefox-${{ github.sha }}.jar name: i2pfirefox.jar
path: ./src/build/i2pfirefox.jar path: ./src/build/i2pfirefox.jar
- name: Upload i2pfirefox-plugin.jar - name: Upload i2pfirefox-plugin.jar
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pfirefox-plugin-${{ github.sha }}.jar name: i2pfirefox-plugin.jar
path: ./src/build/i2pfirefox-plugin.jar path: ./src/build/i2pfirefox-plugin.jar
- name: Upload i2pbrowser.tar.gz - name: Upload i2pbrowser.tar.gz
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-${{ github.sha }}.tar.gz name: i2pbrowser.tar.gz
path: ./i2pbrowser.tar.gz path: ./i2pbrowser.tar.gz
- name: Upload i2pbrowser.deb - name: Upload i2pbrowser.deb
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser_${{ github.sha }}_amd64.deb name: i2pbrowser_amd64.deb
path: ./i2pbrowser_1.0.0_amd64.deb path: ./i2pbrowser_1.0.0_amd64.deb
- name: build plugin with Ant - name: build plugin with Ant
run: | run: |
@ -84,7 +84,7 @@ jobs:
- name: Upload i2pfirefox.zip (unsigned plugin) - name: Upload i2pfirefox.zip (unsigned plugin)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pfirefox-${{ github.sha }}.zip name: i2pfirefox.zip
path: ./plugin.zip path: ./plugin.zip
@ -132,7 +132,7 @@ jobs:
- name: Upload i2pbrowser.rpm - name: Upload i2pbrowser.rpm
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-${{ github.sha }}.x86_64.rpm name: i2pbrowser.x86_64.rpm
path: ./i2pbrowser-1.0.0-1.x86_64.rpm path: ./i2pbrowser-1.0.0-1.x86_64.rpm
@ -171,7 +171,7 @@ jobs:
- name: Upload Firefox Profile EXE Installer - name: Upload Firefox Profile EXE Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-1.0.0-${{ github.sha }}.exe name: i2pbrowser-1.0.0.exe
path: ./i2pbrowser-1.0.0.exe path: ./i2pbrowser-1.0.0.exe
- name: build msi with Ant - name: build msi with Ant
run: | run: |
@ -180,7 +180,7 @@ jobs:
- name: Upload Firefox Profile MSI Installer - name: Upload Firefox Profile MSI Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-1.0.0-${{ github.sha }}.msi name: i2pbrowser-1.0.0.msi
path: ./i2pbrowser-1.0.0.msi path: ./i2pbrowser-1.0.0.msi
- name: build portable zip with Ant - name: build portable zip with Ant
run: | run: |
@ -189,7 +189,7 @@ jobs:
- name: Upload Firefox Profile Portable Zip - name: Upload Firefox Profile Portable Zip
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-portable-${{ github.sha }}.zip name: i2pbrowser-portable.zip
path: ./i2pbrowser-portable.zip path: ./i2pbrowser-portable.zip
buildmac: buildmac:
@ -227,7 +227,7 @@ jobs:
- name: Upload Firefox Profile DMG Installer - name: Upload Firefox Profile DMG Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-1.0.0-${{ github.sha }}.dmg name: i2pbrowser-1.0.0.dmg
path: ./i2pbrowser-1.0.0.dmg path: ./i2pbrowser-1.0.0.dmg
- name: build pkg with Ant - name: build pkg with Ant
run: | run: |
@ -236,5 +236,5 @@ jobs:
- name: Upload Firefox Profile PKG Installer - name: Upload Firefox Profile PKG Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: i2pbrowser-1.0.0-${{ github.sha }}.pkg name: i2pbrowser-1.0.0.pkg
path: ./i2pbrowser-1.0.0.pkg path: ./i2pbrowser-1.0.0.pkg

View File

@ -3,4 +3,4 @@ export GITHUB_USER=eyedeekay
export GITHUB_REPO=i2p.plugins.firefox export GITHUB_REPO=i2p.plugins.firefox
export GITHUB_NAME="Updates extensions, plugin support temporarily removed(Stay on the old version)" export GITHUB_NAME="Updates extensions, plugin support temporarily removed(Stay on the old version)"
export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md) export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md)
export GITHUB_TAG=1.3.1 export GITHUB_TAG=1.4.0

View File

@ -44,6 +44,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
private final File profileDir; private final File profileDir;
private MenuHandle lmhs; private MenuHandle lmhs;
private MenuHandle lmhf; private MenuHandle lmhf;
/**
* @since 1.4.0
* @return
*/
public I2PBrowserPlugin() { public I2PBrowserPlugin() {
_context = new I2PAppContext(); _context = new I2PAppContext();
_mgr = null; _mgr = null;
@ -52,6 +56,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/"); pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/");
profileDir = new File(pluginDir, "profile/"); profileDir = new File(pluginDir, "profile/");
} }
/**
* @since 1.4.0
* @return
*/
public I2PBrowserPlugin(I2PAppContext ctx, ClientAppManager mgr, public I2PBrowserPlugin(I2PAppContext ctx, ClientAppManager mgr,
String args[]) { String args[]) {
_context = ctx; _context = ctx;
@ -61,9 +69,26 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/"); pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/");
profileDir = new File(pluginDir, "profile/"); profileDir = new File(pluginDir, "profile/");
} }
/**
* @since 1.4.0
* @return
*/
public String getDisplayName() { return "I2P Browser"; } public String getDisplayName() { return "I2P Browser"; }
/**
* @since 1.4.0
* @return
*/
public String getName() { return "I2P Browser"; } public String getName() { return "I2P Browser"; }
/**
* @since 1.4.0
* @return
*/
public ClientAppState getState() { return ClientAppState.STOPPED; } public ClientAppState getState() { return ClientAppState.STOPPED; }
/**
* @since 1.4.0
* @return
*/
public void shutdown(String[] args) { public void shutdown(String[] args) {
if (!isSystrayEnabled()) { if (!isSystrayEnabled()) {
_log.info("I2P Browser tray manager not supported"); _log.info("I2P Browser tray manager not supported");
@ -81,6 +106,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
changeState(ClientAppState.STOPPED); changeState(ClientAppState.STOPPED);
} }
/**
* @since 1.4.0
* @return
*/
public void startup() { public void startup() {
changeState(ClientAppState.STOPPED); changeState(ClientAppState.STOPPED);
if (!isSystrayEnabled()) { if (!isSystrayEnabled()) {
@ -124,6 +153,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
// Copied directly from I2PSnark-standalone // Copied directly from I2PSnark-standalone
/**
* @since 1.4.0
* @return
*/
private MenuService startTrayApp() { private MenuService startTrayApp() {
try { try {
if (isSystrayEnabled()) { if (isSystrayEnabled()) {
@ -143,6 +176,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
// whether to launchFirefox the tray app Our environment should basically // whether to launchFirefox the tray app Our environment should basically
// never be headless, that doesn't make any sense, but something tells me I // never be headless, that doesn't make any sense, but something tells me I
// should leave that check in. // should leave that check in.
/**
* @since 1.4.0
* @return
*/
private boolean isSystrayEnabled() { private boolean isSystrayEnabled() {
if (GraphicsEnvironment.isHeadless()) if (GraphicsEnvironment.isHeadless())
return false; return false;
@ -159,8 +196,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
/** /**
* Callback when Start I2PBrowser is clicked in systray * Callback when Start I2PBrowser is clicked in systray
* @since 0.9.61 *
* @since 1.4.0
* @return
*/ */
public class Starter implements MenuCallback { public class Starter implements MenuCallback {
private final MenuService _ms; private final MenuService _ms;
@ -181,6 +220,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
} }
/**
* @since 1.4.0
* @return
*/
public class FlexStarter implements MenuCallback { public class FlexStarter implements MenuCallback {
private final MenuService _ms; private final MenuService _ms;
public FlexStarter(MenuService ms) { _ms = ms; } public FlexStarter(MenuService ms) { _ms = ms; }
@ -201,6 +244,10 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
} }
/**
* @since 1.4.0
* @return
*/
private synchronized void changeState(ClientAppState state) { private synchronized void changeState(ClientAppState state) {
if (_mgr != null) if (_mgr != null)
_mgr.notify(this, state, null, null); _mgr.notify(this, state, null, null);