Compare commits

...

39 Commits
1.3.0 ... 2.5.1

Author SHA1 Message Date
bdf9ca5548 page generation update for: 2024-03-19 21:28:44.180012645 -0400 EDT m=+386.223210846 2024-03-19 21:28:44 -04:00
397afe0cb7 fix plugin upload script, fix plugin install docs 2024-03-19 21:21:55 -04:00
0df0a380bb update plugin version number in plugin release script 2024-03-19 18:31:23 -04:00
10887da2f7 Get tag from repo not from config 2024-03-19 18:19:43 -04:00
3da4c9ee1e we can distribute signed plugin builds so use the plugin-upload script to do that. 2024-03-19 17:56:52 -04:00
c24a0acea1 Split out plugin upload script 2024-03-19 17:53:11 -04:00
41a4e895cc Start on plugin instructions 2024-03-18 11:21:03 -04:00
ba6275008a Start on plugin instructions 2024-03-18 11:19:12 -04:00
f268f3b459 Update README.md 2024-03-18 10:57:10 -04:00
eb195f7dba Add nektos/act note to BUILD.md 2024-03-18 10:35:20 -04:00
bbd2fdeeec Increase thread delay between ldtg and launch 2024-03-10 00:57:22 -05:00
ecfc447125 speedup run by validating only once 2024-03-07 22:37:47 -05:00
238f3fd839 unzip un changes generation phase 2024-03-07 22:18:13 -05:00
c01312a1a5 unzip un changes generation phase 2024-03-07 22:17:07 -05:00
b72dd14310 unzip un changes generation phase 2024-03-07 21:41:15 -05:00
64aac910a6 Fix changes 2024-03-07 21:23:38 -05:00
246c27627b don't skip unpacking 2024-03-07 21:21:14 -05:00
d529f353e4 Version 1.4.1 2024-03-07 21:14:09 -05:00
89cff0c444 Version 1.4.0 2024-03-07 20:47:18 -05:00
ff19ea685b more CI 2024-03-07 16:14:20 -05:00
e5f6f335ee more CI 2024-03-07 15:53:21 -05:00
bcfbf90be2 more CI 2024-03-07 15:25:21 -05:00
63922c3880 more CI 2024-03-07 15:23:06 -05:00
35570a119d more CI 2024-03-07 15:02:33 -05:00
b877b6141d sleep longer for releases 2024-03-07 14:44:52 -05:00
62f23d360d sleep longer for releases 2024-03-07 14:32:53 -05:00
c78614fea5 sleep longer for releases 2024-03-07 14:30:06 -05:00
44cc27b968 sleep for releases 2024-03-07 14:24:24 -05:00
274748d08b Add checksums to release body 2024-03-07 14:18:19 -05:00
b4840b7355 Add checksums to release body 2024-03-07 14:11:37 -05:00
6072b8552e skip unpacking artifacts, only checkout changelog 2024-03-07 13:48:05 -05:00
7c0070cd15 skip unpacking artifacts, only checkout changelog 2024-03-07 13:43:09 -05:00
8083c6c652 skip unpacking artifacts, only checkout changelog 2024-03-07 13:40:26 -05:00
d9d13fac70 check out repo prior to release 2024-03-07 13:33:50 -05:00
75049fa08e fix plugin build 2024-03-07 13:25:50 -05:00
113caaa922 Attempt release upload in CI 2024-03-07 13:19:19 -05:00
bf1b923750 redownload artifacts from ant.yml in release release.yml 2024-03-07 13:12:50 -05:00
286122d492 see about doing releases in CI 2024-03-07 12:52:19 -05:00
9ebc0eae81 page generation update for: 2024-03-07 11:35:28.227799872 -0500 EST m=+44.700656834 2024-03-07 11:35:28 -05:00
41 changed files with 1619 additions and 75 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

78
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,78 @@
name: Release
#on: [push]
on:
push:
# Sequence of patterns matched against refs/tags
tags:
- '*.*.*' # Release 1.2.3
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
sparse-checkout: |
CHANGES.md
sparse-checkout-cone-mode: false
- name: sleep 15 minutes
run: |
echo "sleeping 15 minutes to wait for artifacts"
sleep 1m
echo "sleeping 14 minutes to wait for artifacts"
sleep 1m
echo "sleeping 13 minutes to wait for artifacts"
sleep 1m
echo "sleeping 12 minutes to wait for artifacts"
sleep 1m
echo "sleeping 11 minutes to wait for artifacts"
sleep 1m
echo "sleeping 10 minutes to wait for artifacts"
sleep 1m
echo "sleeping 9 minutes to wait for artifacts"
sleep 1m
echo "sleeping 8 minutes to wait for artifacts"
sleep 1m
echo "sleeping 7 minutes to wait for artifacts"
sleep 1m
echo "sleeping 6 minutes to wait for artifacts"
sleep 1m
echo "sleeping 5 minutes to wait for artifacts"
sleep 1m
echo "sleeping 4 minutes to wait for artifacts"
sleep 1m
echo "sleeping 3 minutes to wait for artifacts"
sleep 1m
echo "sleeping 2 minutes to wait for artifacts"
sleep 1m
echo "sleeping 1 minutes to wait for artifacts"
sleep 1m
- name: Download artifacts
id: download-artifact
uses: dawidd6/action-download-artifact@v3
with:
skip_unpack: true
workflow: ant.yml
if_no_artifact_found: fail
# remove .zip file extension
- run: for f in *.zip; do unzip "$f"; rm "$f"; done
- run: echo "" | tee -a CHANGES.md
- run: echo "## Checksums" | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: sha256sum * | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: file * | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- name: Upload artifacts
uses: ncipollo/release-action@v1
with:
artifacts: "*"
bodyFile: "CHANGES.md"

View File

@ -55,6 +55,11 @@
docs/BUILD docs/BUILD
</a> </a>
</li> </li>
<li>
<a href="docs/I2P-PLUGIN.html">
docs/I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="docs/I2PBrowser.html"> <a href="docs/I2PBrowser.html">
docs/I2PBrowser docs/I2PBrowser
@ -146,6 +151,23 @@
<a id="returnhome" href="/"> <a id="returnhome" href="/">
/ /
</a> </a>
<h2>
Thu, March 7
</h2>
<ul>
<li>
re-implement Plugin functions with Destop GUI API.
</li>
<li>
Fix several NPE&rsquo;s
</li>
<li>
Delete redundant code
</li>
<li>
CI/CD improvements, packaging improvements
</li>
</ul>
<h2> <h2>
Tue, January 17 Tue, January 17
</h2> </h2>

View File

@ -169,4 +169,44 @@ Saturday, August 6
- Implemented firefox detection - Implemented firefox detection
- Implemented directory setup - Implemented directory setup
- Implemented processBuilder generator - Implemented processBuilder generator
## Checksums
```
dc8797cfae23640e27ed7b32a3e6ccec232d24411d64cd9e5b107f8c5384a70a CHANGES.md
9a36e15def2a95077027cd0db5f95b345a87a8edfe5e89ea7f83aaa3c94f5ebb i2p.chromium.base.profile.zip
97ae21d621f813fd2d91f5921fe1eee95ec0d01782bf93db7b3689f959a9f3b8 i2p.chromium.usability.profile.zip
5cd673bb27827e67796b52f26194b7b1504dddf1630ad9d9084ab6a318c6d20a i2p.firefox.base.profile.zip
556fc2df825e64b1463e88ec77a5de46bce61516a475e1136110363d5badabd2 i2p.firefox.usability.profile.zip
6d3882ac113116b8f40ce07985e779859a68f43f14278b40f1628ea5362acca5 i2pbrowser-1.0.0-1.x86_64.rpm
aa7185799b17fd7893818fe7728f3e3cb6b4c8022e033fc0f33f6be81e7b2c2f i2pbrowser-1.0.0.dmg
c307fb6556821258520a3d522cf7fbe2031aa421161fcac3e409f5ce20a1637a i2pbrowser-1.0.0.exe
5eae853ff7f8b9a05c4c7111147882a54aabd1cf581d21396878055a54a3efc7 i2pbrowser-1.0.0.msi
cda1bb2058048a4303bbc65543a0f340ade1c88881ee60704333e767bae10db6 i2pbrowser-1.0.0.pkg
183197aa39e891d5763ef5449957b9d9790bdfaaa06760288526f6283b865d97 i2pbrowser-portable.zip
f017951df66f2e3d2d57886085a95bd2463cc8f7d793683960da30b842b9b17b i2pbrowser.tar.gz
4538172d9753967485566e52f064dbc06a5123971044d973766de28051d53eb1 i2pbrowser_1.0.0_amd64.deb
6b5dd3e4ab1bcb3df4a5a758b5469239453c713bb6266bc5eea8b0d9ec7aa413 i2pfirefox-plugin.jar
85ce64a3c03c72421947c777a72d42be6fc568c5317070927463accb347b703f i2pfirefox.jar
9856613f8229a773ef54a9e7e2a37a6c788755d96393478afce8db7439404e42 plugin.zip
```
```
CHANGES.md: ASCII text
i2p.chromium.base.profile.zip: Zip archive data, at least v2.0 to extract, compression method=store
i2p.chromium.usability.profile.zip: Zip archive data, at least v2.0 to extract, compression method=store
i2p.firefox.base.profile.zip: Zip archive data, at least v2.0 to extract, compression method=store
i2p.firefox.usability.profile.zip: Zip archive data, at least v2.0 to extract, compression method=store
i2pbrowser-1.0.0-1.x86_64.rpm: RPM v3.0 bin i386/x86_64
i2pbrowser-1.0.0.dmg: zlib compressed data
i2pbrowser-1.0.0.exe: PE32+ executable (GUI) x86-64, for MS Windows
i2pbrowser-1.0.0.msi: Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.2, MSI Installer, Code page: 1252, Title: Installation Database, Subject: i2pbrowser, Author: Unknown, Keywords: Installer, Comments: This installer database contains the logic and data required to install i2pbrowser., Template: x64;1033, Revision Number: {6D1D56D8-CB72-4709-BD0B-0FDBF71C6D32}, Create Time/Date: Sun Mar 10 06:04:32 2024, Last Saved Time/Date: Sun Mar 10 06:04:32 2024, Number of Pages: 200, Number of Words: 10, Name of Creating Application: Windows Installer XML Toolset (3.14.0.8606), Security: 2
i2pbrowser-1.0.0.pkg: xar archive compressed TOC: 1244, SHA-1 checksum, contains zlib compressed data
i2pbrowser-portable.zip: Zip archive data, at least v2.0 to extract, compression method=deflate
i2pbrowser.tar.gz: gzip compressed data, from Unix, original size modulo 2^32 725985280
i2pbrowser_1.0.0_amd64.deb: Debian binary package (format 2.0), with control.tar.zs, data compression zst
i2pfirefox-plugin.jar: Java archive data (JAR)
i2pfirefox.jar: Java archive data (JAR)
plugin.zip: Zip archive data, at least v1.0 to extract, compression method=store
```

View File

@ -55,6 +55,11 @@
docs/BUILD docs/BUILD
</a> </a>
</li> </li>
<li>
<a href="docs/I2P-PLUGIN.html">
docs/I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="docs/I2PBrowser.html"> <a href="docs/I2PBrowser.html">
docs/I2PBrowser docs/I2PBrowser

View File

@ -11,6 +11,28 @@ trackers, and jerks using off-the-shelf techniques and exploits. It is fundament
to make changes which un-trust your browser vendor, your OS, your package manager or any to make changes which un-trust your browser vendor, your OS, your package manager or any
other system that exists underneath it. **It is just a profile manager.** other system that exists underneath it. **It is just a profile manager.**
**What is this?**
This is a browser profile manager which pre-configures a browser on the host system, usually
Firefox or Tor Browser, for browsing I2P. When acting as an I2P Plugin, it adds GUI elements to
I2P for launching the browser in a highly restricted "Safe" mode(the default) or a more permissive
"Usability" mode.
This package expresses functionality that has existed in many places at many times, sometimes
bundled with other software. As it has developed here, the border of where the Easy-Install
ends and Firefox Profile Manager begins has become clearer. This repository contains the profile
manager and it's buildsystem, the whole profile manager, and nothing but the profile manager.
It can be used independently of other software, provided an I2P proxy on the host system somewhere.
However, in practice, most people probably get it alongside an I2P router, through the **I2P Easy-Install Bundle for Windows**.
**What version numbers should I pay attention to?**
When I decided to port the `.bat` launcher scripts from the Easy-Install bundle to Java, this project
was created and started using it's own version numbers. This was the practice up until version 1.5.0,
which was the last version to use a different version number than I2P itself. Starting in April 2024,
`i2p.plugins.firefox` will follow along with the Java I2P major and minor version numbers. Incremental
changes may become differing point releases.
**All packages require a running I2P router.** **All packages require a running I2P router.**
**[Windows users should see the Easy-Install Bundle](https://i2pgit.org/i2p-hackers/i2p.firefox)** **[Windows users should see the Easy-Install Bundle](https://i2pgit.org/i2p-hackers/i2p.firefox)**
@ -47,6 +69,7 @@ directory for Firefox, and the `src/i2p.chromium.*.profile/extensions/*.js/*` di
For platform specific instructions, see For platform specific instructions, see
- [I2P-PLUGIN.md](docs/I2P-PLUGIN.md)/[I2P-PLUGIN.html](docs/I2P-PLUGIN.html)
- [LINUX.md](docs/LINUX.md)/[LINUX.html](docs/LINUX.html) - [LINUX.md](docs/LINUX.md)/[LINUX.html](docs/LINUX.html)
- [OSX.md](docs/OSX.md)/[OSX.html](docs/OSX.html) - [OSX.md](docs/OSX.md)/[OSX.html](docs/OSX.html)
- [WINDOWS.md](docs/WINDOWS.md)/[WINDOWS.html](docs/WINDOWS.html) - [WINDOWS.md](docs/WINDOWS.md)/[WINDOWS.html](docs/WINDOWS.html)
@ -55,7 +78,7 @@ For platform specific instructions, see
```sh ```sh
mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pfirefox.zip wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
unzip i2pfirefox.zip unzip i2pfirefox.zip
./i2pfirefox.cmd ./i2pfirefox.cmd

View File

@ -55,6 +55,11 @@
docs/BUILD docs/BUILD
</a> </a>
</li> </li>
<li>
<a href="docs/I2P-PLUGIN.html">
docs/I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="docs/I2PBrowser.html"> <a href="docs/I2PBrowser.html">
docs/I2PBrowser docs/I2PBrowser
@ -153,14 +158,14 @@
Firefox Firefox
</h2> </h2>
<pre><code class="language-md">i2p-in-private-browsing <pre><code class="language-md">i2p-in-private-browsing
1.50 1.48
https://addons.mozilla.org/firefox/downloads/file/4213716/i2p_in_private_browsing-1.50.xpi https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
noscript noscript
11.4.29 11.4.29
https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
localcdn-fork-of-decentraleyes localcdn-fork-of-decentraleyes
2.6.60 2.6.64
https://addons.mozilla.org/firefox/downloads/file/4208268/localcdn_fork_of_decentraleyes-2.6.60.xpi https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
onion-in-container-browsing onion-in-container-browsing
0.82 0.82
https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
@ -168,8 +173,8 @@ javascript-restrictor
0.17 0.17
https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
ublock-origin ublock-origin
1.54.0 1.56.0
https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
</code></pre> </code></pre>
<h2> <h2>
Chromium Chromium
@ -181,10 +186,10 @@ NoScript
11.4.18 11.4.18
https://clients2.google.com/service/update2/crx https://clients2.google.com/service/update2/crx
LocalCDN LocalCDN
2.6.60 2.6.65
https://clients2.google.com/service/update2/crx https://clients2.google.com/service/update2/crx
uBlock Origin uBlock Origin
1.54.0 1.56.0
https://clients2.google.com/service/update2/crx https://clients2.google.com/service/update2/crx
__MSG_extensionName__ __MSG_extensionName__
0.17 0.17

View File

@ -35,7 +35,7 @@ NoScript
11.4.18 11.4.18
https://clients2.google.com/service/update2/crx https://clients2.google.com/service/update2/crx
LocalCDN LocalCDN
2.6.64 2.6.65
https://clients2.google.com/service/update2/crx https://clients2.google.com/service/update2/crx
uBlock Origin uBlock Origin
1.56.0 1.56.0

View File

@ -328,7 +328,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<target name="buildNum"> <target name="buildNum">
<buildnumber file="scripts/build.number" /> <buildnumber file="scripts/build.number" />
<property name="release.number" value="1.2.0" /> <property name="release.number" value="1.4.991" />
<exec executable="echo" osfamily="unix"> <exec executable="echo" osfamily="unix">
<arg value="${release.number}-${build.number}" /> <arg value="${release.number}-${build.number}" />
</exec> </exec>

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.0 export GITHUB_TAG=$(git describe --tags --abbrev=0)

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser
@ -152,6 +157,42 @@
<h2> <h2>
Build Dependencies Build Dependencies
</h2> </h2>
<p>
<strong>
SHORTCUT:
</strong>
All the build artifacts can be produced by the description in the
<code>
.yaml
</code>
files in
<code>
.github/workflows
</code>
.
These can be run on Github&rsquo;s infrastructure, or on a local PC using
<a href="https://github.com/nektos/act">
https://github.com/nektos/act
</a>
.
Windows targets will require a Windows PC!
Doing things this way deals with all the dependency issues that Windows doesn&rsquo;t really give you a good way to deal with automatically.
It also guarantees that the same base container and environment gets used for every build no matter what machine it runs on.
I highly recommend you use either Github CI or
<code>
nektos/act
</code>
for dev builds of this software, as it
<strong>
automates literally every one of the steps
</strong>
.
CI-based builds follow the
<code>
WSL
</code>
version of the instructions.
</p>
<p> <p>
You will need You will need
<code> <code>

View File

@ -2,6 +2,14 @@
## Build Dependencies ## Build Dependencies
**SHORTCUT:** All the build artifacts can be produced by the description in the `.yaml` files in `.github/workflows`.
These can be run on Github's infrastructure, or on a local PC using https://github.com/nektos/act.
Windows targets will require a Windows PC!
Doing things this way deals with all the dependency issues that Windows doesn't really give you a good way to deal with automatically.
It also guarantees that the same base container and environment gets used for every build no matter what machine it runs on.
I highly recommend you use either Github CI or `nektos/act` for dev builds of this software, as it **automates literally every one of the steps**.
CI-based builds follow the `WSL` version of the instructions.
You will need `ant` and java `java` and for building the jar. You will need You will need `ant` and java `java` and for building the jar. You will need
`jpackage` for many of the potential build targets. I've been using Java 18 `jpackage` for many of the potential build targets. I've been using Java 18
on Debian mostly, on Debian and Ubuntu, install the dependencies with: on Debian mostly, on Debian and Ubuntu, install the dependencies with:

1106
docs/I2P-PLUGIN.html Normal file

File diff suppressed because it is too large Load Diff

23
docs/I2P-PLUGIN.md Normal file
View File

@ -0,0 +1,23 @@
### I2P Plugin Support
Since version `1.5.0`, this package has had basic plugin support in Java I2P.
This means it can be integrated with your I2P installation or portable package, with
the benefit of reduced size requirements, automatic updates, and integration with the I2P UI.
Installation in this way is **platform-independent**, the same package is used for Linux, Windows, and OSX.
In this type of installation, the profile manager install is entirely managed by I2P.
Uninstalling I2P will also uninstall the profile manager.
#### Downloading the Plugin
Right now, the best way to download the plugin is from the Github releases page.
First, download the `i2pfirefox.su3` file from [the latest release](https://github.com/eyedeekay/i2p.plugins.firefox/releases).
Versions ending in `0` will always have a plugin release, starting with `1.5.0`.
Dev builds will not have a reliable plugin release.
#### Install the plugin "From File"
Once you have downloaded the `i2pfirefox.su3` file, open [`http://127.0.0.1:7657/configplugins`](http://127.0.0.1:7657/configplugins) and scroll to the bottom of the page.
Under the heading **Installation from File**, click the "Browse" button.
In the window that appears, select the `i2pfirefox.su3` file you just downloaded.
Finally, click the "Install plugin from File" button.
The plugin will install and start shortly.

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser
@ -166,7 +171,7 @@
</code> </code>
</h4> </h4>
<pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser <pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pbrowser.tar.gz wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pbrowser.tar.gz
tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory. ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
# This probably offers better security than vanilla Firefox. # This probably offers better security than vanilla Firefox.

View File

@ -7,7 +7,7 @@ Linux. These packages are for the **`amd64`** architecture.
```sh ```sh
mkdir ~/tmp-i2pbrowser && cd ~/tmp-i2pbrowser mkdir ~/tmp-i2pbrowser && cd ~/tmp-i2pbrowser
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pbrowser.tar.gz wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pbrowser.tar.gz
tar xvzf i2pbrowser.tar.gz && cd i2pbrowser tar xvzf i2pbrowser.tar.gz && cd i2pbrowser
## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory. ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
# This probably offers better security than vanilla Firefox. # This probably offers better security than vanilla Firefox.

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser
@ -159,7 +164,7 @@
file with any Java greater than Java 8. file with any Java greater than Java 8.
</p> </p>
<pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pfirefox.zip wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
unzip i2pfirefox.zip unzip i2pfirefox.zip
./cmd/i2pfirefox.cmd ./cmd/i2pfirefox.cmd

View File

@ -7,7 +7,7 @@ packages. You can use the `.jar` file with any Java greater than Java 8.
```sh ```sh
mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pfirefox.zip wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
unzip i2pfirefox.zip unzip i2pfirefox.zip
./cmd/i2pfirefox.cmd ./cmd/i2pfirefox.cmd

View File

@ -55,6 +55,11 @@
BUILD BUILD
</a> </a>
</li> </li>
<li>
<a href="I2P-PLUGIN.html">
I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="I2PBrowser.html"> <a href="I2PBrowser.html">
I2PBrowser I2PBrowser
@ -163,7 +168,7 @@
</h4> </h4>
<p> <p>
<strong> <strong>
(Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows) (Recommended for advanced users ONLY. Most people should be using Easy-Install Bundle for Windows)
</strong> </strong>
</p> </p>
<ol> <ol>

View File

@ -7,7 +7,7 @@ an unbundled I2P router with an external JVM.
#### Windows Jpackage: `.zip` #### Windows Jpackage: `.zip`
**(Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)** **(Recommended for advanced users ONLY. Most people should be using Easy-Install Bundle for Windows)**
1. Start your I2P Router 1. Start your I2P Router
2. Download the latest release `.zip` from [Github](https://github.com/eyedeekay/i2p.plugins.firefox/releases) and verify it's hash. 2. Download the latest release `.zip` from [Github](https://github.com/eyedeekay/i2p.plugins.firefox/releases) and verify it's hash.

Binary file not shown.

View File

@ -55,6 +55,11 @@
docs/BUILD docs/BUILD
</a> </a>
</li> </li>
<li>
<a href="docs/I2P-PLUGIN.html">
docs/I2P-PLUGIN
</a>
</li>
<li> <li>
<a href="docs/I2PBrowser.html"> <a href="docs/I2PBrowser.html">
docs/I2PBrowser docs/I2PBrowser
@ -172,6 +177,48 @@
It is just a profile manager. It is just a profile manager.
</strong> </strong>
</p> </p>
<p>
<strong>
What is this?
</strong>
</p>
<p>
This is a browser profile manager which pre-configures a browser on the host system, usually
Firefox or Tor Browser, for browsing I2P. When acting as an I2P Plugin, it adds GUI elements to
I2P for launching the browser in a highly restricted &ldquo;Safe&rdquo; mode(the default) or a more permissive
&ldquo;Usability&rdquo; mode.
</p>
<p>
This package expresses functionality that has existed in many places at many times, sometimes
bundled with other software. As it has developed here, the border of where the Easy-Install
ends and Firefox Profile Manager begins has become clearer. This repository contains the profile
manager and it&rsquo;s buildsystem, the whole profile manager, and nothing but the profile manager.
It can be used independently of other software, provided an I2P proxy on the host system somewhere.
</p>
<p>
However, in practice, most people probably get it alongside an I2P router, through the
<strong>
I2P Easy-Install Bundle for Windows
</strong>
.
</p>
<p>
<strong>
What version numbers should I pay attention to?
</strong>
When I decided to port the
<code>
.bat
</code>
launcher scripts from the Easy-Install bundle to Java, this project
was created and started using it&rsquo;s own version numbers. This was the practice up until version 1.5.0,
which was the last version to use a different version number than I2P itself. Starting in April 2024,
<code>
i2p.plugins.firefox
</code>
will follow along with the Java I2P major and minor version numbers. Incremental
changes may become differing point releases.
</p>
<p> <p>
<strong> <strong>
All packages require a running I2P router. All packages require a running I2P router.
@ -269,6 +316,15 @@
For platform specific instructions, see For platform specific instructions, see
</p> </p>
<ul> <ul>
<li>
<a href="docs/I2P-PLUGIN.md">
I2P-PLUGIN.md
</a>
/
<a href="docs/I2P-PLUGIN.html">
I2P-PLUGIN.html
</a>
</li>
<li> <li>
<a href="docs/LINUX.md"> <a href="docs/LINUX.md">
LINUX.md LINUX.md
@ -305,7 +361,7 @@
and a non-bundled Java and a non-bundled Java
</h4> </h4>
<pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.2.0/i2pfirefox.zip wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
unzip i2pfirefox.zip unzip i2pfirefox.zip
./i2pfirefox.cmd ./i2pfirefox.cmd

30
plugin-upload.sh Executable file
View File

@ -0,0 +1,30 @@
#! /usr/bin/env sh
. ./config.sh
NUMLINE=`grep release.number build.xml | head -n 1`
sed -i "s|${NUMLINE}| <property name=\"release.number\" value=\"$GITHUB_TAG\" />|g" build.xml
ant distclean versionMd jar plugin
github-release release --user "${GITHUB_USER}" \
--repo "${GITHUB_REPO}" \
--name "${GITHUB_NAME}" \
--description "${GITHUB_DESCRIPTION}" \
--tag "${GITHUB_TAG}"; true
sleep 2s
susum=$(sha256sum i2pfirefox.su3)
github-release upload --user "${GITHUB_USER}" \
--replace \
--repo "${GITHUB_REPO}" \
--tag "${GITHUB_TAG}" \
--label "I2P Browser launcher as an I2P Console Plugin. ${susum}" \
--name "i2pfirefox.su3" \
--file "i2pfirefox.su3"
#susum=$(sha256sum i2pfirefox-update.su3)
#github-release upload --user "${GITHUB_USER}" \
# --replace \
# --repo "${GITHUB_REPO}" \
# --tag "${GITHUB_TAG}" \
# --label "I2P Browser launcher as an I2P Console Plugin, update-only. ${susum}" \
# --name "i2pfirefox-update.su3" \
# --file "i2pfirefox-update.su3"
echo "Uploaded su3 package"

View File

@ -12,4 +12,4 @@ READMELINE=`grep 'i2p.plugins.firefox/releases/download' docs/OSX.md | grep i2pf
sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pfirefox.zip|g" docs/OSX.md sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pfirefox.zip|g" docs/OSX.md
sed -i "s|${NUMLINE}| <property name=\"release.number\" value=\"$GITHUB_TAG\" />|g" build.xml sed -i "s|${NUMLINE}| <property name=\"release.number\" value=\"$GITHUB_TAG\" />|g" build.xml
edgar && git push --all edgar && git push --all
ant distclean versionMd jar plugin torrent freeZip jpackage debian fedora tarball ant distclean versionMd jar plugin torrent freeZip jpackage debian tarball

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Thu Mar 07 11:01:16 EST 2024 #Tue Mar 19 18:47:29 EDT 2024
build.number=699 build.number=717

View File

@ -1,27 +1,6 @@
package net.i2p.i2pfirefox; package net.i2p.i2pfirefox;
/*import java.awt.AWTException;
import java.awt.Component;
import java.awt.Image;
import java.awt.Menu;
import java.awt.MenuItem;
import java.awt.PopupMenu;
import java.awt.SystemTray;
import java.awt.Toolkit;
import java.awt.TrayIcon;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;*/
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* I2PBrowser.java * I2PBrowser.java

View File

@ -9,11 +9,9 @@ import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.Properties; import java.util.Properties;
import java.util.logging.FileHandler; import java.util.logging.FileHandler;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -36,6 +34,7 @@ public class I2PCommonBrowser {
private Properties prop = new Properties(); private Properties prop = new Properties();
public Logger logger = Logger.getLogger("browserlauncher"); public Logger logger = Logger.getLogger("browserlauncher");
private FileHandler fh; private FileHandler fh;
private boolean validated = false;
int CONFIGURED_TIMEOUT = 200; int CONFIGURED_TIMEOUT = 200;
public I2PCommonBrowser() { public I2PCommonBrowser() {
@ -75,6 +74,8 @@ public class I2PCommonBrowser {
* @return None No return value. * @return None No return value.
*/ */
public void validateUserDirectory() { public void validateUserDirectory() {
if (validated)
return;
logger.info("Validating user directory"); logger.info("Validating user directory");
String userDir = System.getProperty("user.dir"); String userDir = System.getProperty("user.dir");
String userHome = System.getProperty("user.home"); String userHome = System.getProperty("user.home");
@ -123,6 +124,7 @@ public class I2PCommonBrowser {
logger.info(defaultPathFile.getAbsolutePath()); logger.info(defaultPathFile.getAbsolutePath());
} }
System.setProperty("user.dir", defaultPathFile.getAbsolutePath()); System.setProperty("user.dir", defaultPathFile.getAbsolutePath());
validated = true;
} }
/** /**

View File

@ -4,7 +4,6 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

View File

@ -1,8 +1,5 @@
package net.i2p.i2pfirefox; package net.i2p.i2pfirefox;
import java.io.*;
import javax.script.*;
/** /**
* I2PLibreWolf.java * I2PLibreWolf.java
* Copyright (C) 2022 idk <hankhill19580@gmail.com> * Copyright (C) 2022 idk <hankhill19580@gmail.com>

View File

@ -42,7 +42,12 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
private static final String PROP_DTG_ENABLED = "desktopgui.enabled"; private static final String PROP_DTG_ENABLED = "desktopgui.enabled";
private final File pluginDir; private final File pluginDir;
private final File profileDir; private final File profileDir;
private MenuHandle lmh; private MenuHandle lmhs;
private MenuHandle lmhf;
/**
* @since 1.4.0
* @return
*/
public I2PBrowserPlugin() { public I2PBrowserPlugin() {
_context = new I2PAppContext(); _context = new I2PAppContext();
_mgr = null; _mgr = null;
@ -51,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;
@ -60,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");
@ -74,11 +100,16 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
} }
if (dtg != null) { if (dtg != null) {
dtg.removeMenu(lmh); dtg.removeMenu(lmhs);
dtg.removeMenu(lmhf);
} }
} }
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()) {
@ -96,14 +127,19 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
"Starting I2P Browser tray manager by testing http://proxy.i2p"); "Starting I2P Browser tray manager by testing http://proxy.i2p");
MenuService dtg = startTrayApp(); MenuService dtg = startTrayApp();
try { try {
Thread.sleep(1000); Thread.sleep(5000);
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
} }
if (dtg != null) { if (dtg != null) {
_log.info("I2P Browser integrating with I2P tray manager"); _log.info("I2P Browser integrating with I2P tray manager");
lmh = dtg.addMenu("Launch I2P Browser", new Starter(dtg)); lmhs =
dtg.showMenu(lmh); dtg.addMenu("Launch I2P Browser (Safe Mode)", new Starter(dtg));
dtg.enableMenu(lmh); dtg.showMenu(lmhs);
dtg.enableMenu(lmhs);
lmhf = dtg.addMenu("Launch I2P Browser (Flexible Mode)",
new FlexStarter(dtg));
dtg.showMenu(lmhf);
dtg.enableMenu(lmhf);
} else { } else {
_log.info("I2P Browser tray manager not found"); _log.info("I2P Browser tray manager not found");
} }
@ -117,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()) {
@ -136,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;
@ -152,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;
@ -174,11 +220,21 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} }
} }
public class StarterThread implements Runnable { /**
public void run() { * @since 1.4.0
* @return
*/
public class FlexStarter implements MenuCallback {
private final MenuService _ms;
public FlexStarter(MenuService ms) { _ms = ms; }
public void clicked(MenuHandle menu) {
// Thread t = new I2PAppThread(new StarterThread(),
//"I2PBrowser-Launcher start", true);
// t.start();
_log.info("I2P Browser starting up"); _log.info("I2P Browser starting up");
try { try {
I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath()); I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
i2pBrowser.usability = true;
String[] args = {"http://proxy.i2p"}; String[] args = {"http://proxy.i2p"};
i2pBrowser.launchFirefox(0, args); i2pBrowser.launchFirefox(0, args);
} catch (Exception e) { } catch (Exception e) {
@ -188,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);