idk/i2p.plugins.firefox
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

rip out chrome launchers

Browse Source
This commit is contained in:
eyedeekay
2025-05-20 16:01:36 -04:00
parent 284e96ba2d
commit cd1f966aed
2 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build.number
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Tue May 20 15:37:08 EDT 2025 #Tue May 20 15:44:11 EDT 2025
build.number=823 build.number=826

44
src/java/net/i2p/i2pfirefox/I2PBrowser.java
View File

@ -22,7 +22,6 @@ import java.util.ArrayList;
*/ */
public class I2PBrowser extends I2PGenericUnsafeBrowser { public class I2PBrowser extends I2PGenericUnsafeBrowser {
private final I2PFirefox i2pFirefox = new I2PFirefox(); private final I2PFirefox i2pFirefox = new I2PFirefox();
private final I2PChromium i2pChromium = new I2PChromium();
private final I2PGenericUnsafeBrowser i2pGeneral = private final I2PGenericUnsafeBrowser i2pGeneral =
new I2PGenericUnsafeBrowser(); new I2PGenericUnsafeBrowser();
public boolean firefox = false; public boolean firefox = false;
@ -43,16 +42,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
i2pFirefox.storeFirefoxDefaults(); i2pFirefox.storeFirefoxDefaults();
i2pFirefox.launch(privateWindow, url); i2pFirefox.launch(privateWindow, url);
} }
public void launchChromium(int privateWindow, String[] url) {
String priv = privateWindow == 1 ? "private-window" : "long-profile";
logger.info("I2PChromium" + priv);
i2pChromium.usability = usability;
if (url == null)
url = new String[] {"about:blank"};
if (outputConfig)
i2pChromium.storeChromiumDefaults();
i2pChromium.launch(privateWindow, url);
}
private void launchGeneric(int privateWindowInt, String[] url) { private void launchGeneric(int privateWindowInt, String[] url) {
String priv = privateWindowInt == 1 ? "private-window" : "long-profile"; String priv = privateWindowInt == 1 ? "private-window" : "long-profile";
boolean privateWindow = false; boolean privateWindow = false;
@ -84,23 +73,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
public void setBrowser(String browserPath) { this.BROWSER = browserPath; } public void setBrowser(String browserPath) { this.BROWSER = browserPath; }
/**
* Return true if there is a Chromium available
*
* @return true if Chromium is available, false otherwise
* @since 0.0.16
*/
public boolean hasChromium() {
String chrome = i2pChromium.topChromium();
if (chrome == null) {
return false;
}
if (chrome.isEmpty()) {
return false;
}
return true;
}
/** /**
* Return true if there is a Firefox variant available * Return true if there is a Firefox variant available
* *
@ -128,20 +100,8 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
* @since 0.0.17 * @since 0.0.17
*/ */
public void launch(int privateWindow, String[] url) { public void launch(int privateWindow, String[] url) {
if (chromiumFirst) {
if (chromium) {
this.launchChromium(privateWindow, url);
} else if (firefox) {
this.launchFirefox(privateWindow, url);
} else {
this.launchGeneric(privateWindow, url);
}
return;
}
if (firefox) { if (firefox) {
this.launchFirefox(privateWindow, url); this.launchFirefox(privateWindow, url);
} else if (chromium) {
this.launchChromium(privateWindow, url);
} else { } else {
this.launchGeneric(privateWindow, url); this.launchGeneric(privateWindow, url);
} }
@ -182,8 +142,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
boolean r = true; boolean r = true;
if (i2pFirefox != null) if (i2pFirefox != null)
r = i2pFirefox.stop(); r = i2pFirefox.stop();
if (i2pChromium != null)
r = i2pChromium.stop();
if (i2pGeneral != null) if (i2pGeneral != null)
r = i2pGeneral.stop(); r = i2pGeneral.stop();
return r; return r;
@ -192,8 +150,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
public boolean running() { public boolean running() {
if (i2pFirefox != null) if (i2pFirefox != null)
return i2pFirefox.running(); return i2pFirefox.running();
if (i2pChromium != null)
return i2pChromium.running();
if (i2pGeneral != null) if (i2pGeneral != null)
return i2pGeneral.running(); return i2pGeneral.running();
return false; return false;