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

make waitForProxy always return true if the timeout is zero or less

Browse Source
This commit is contained in:
idk
2022-09-07 12:04:03 -04:00
parent 64505f6617
commit 26154f3b7f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/net/i2p/i2pfirefox/I2PChromium.java
View File

@ -592,7 +592,7 @@ public class I2PChromium extends I2PCommonBrowser {
I2PChromiumProfileBuilder.usability = true;
}
if (arg.equals("-noproxycheck")) {
println("zeroing out proxy check")
println("zeroing out proxy check");
i2pChromium.setProxyTimeoutTime(0);
}
if (!arg.startsWith("-")) {

9
src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java
View File

@ -33,8 +33,8 @@ import java.util.zip.ZipInputStream;
public class I2PCommonBrowser {
static Logger logger = Logger.getLogger("browserlauncher");
static FileHandler fh;
private final int DEFAULT_TIMEOUT = 200;
private int CONFIGURED_TIMEOUT = DEFAULT_TIMEOUT;
//private final int DEFAULT_TIMEOUT = 200;
private static int CONFIGURED_TIMEOUT = 200;
public I2PCommonBrowser() {
try {
@ -346,6 +346,8 @@ public class I2PCommonBrowser {
/**
* Waits for an HTTP proxy on the specified port to be ready.
* Returns false on timeout of the specified number of seconds.
* If the timeout is zero or less, the check is disabled and always
* returns true.
*
* @param timeout the number of seconds to wait for the proxy to be ready.
* @param port the port to wait for the proxy to be ready on.
@ -354,7 +356,8 @@ public class I2PCommonBrowser {
* @since 0.0.1
*/
public boolean waitForProxy(int timeout, int port, String host) {
if (timeout == 0){
println("waiting up to " + timeout + "seconds for a proxy");
if (timeout <= 0){
return true;
}
for (int i = 0; i < timeout; i++) {

2
src/java/net/i2p/i2pfirefox/I2PFirefox.java
View File

@ -556,7 +556,7 @@ public class I2PFirefox extends I2PCommonBrowser {
usability = true;
}
if (arg.equals("-noproxycheck")) {
println("zeroing out proxy check")
println("zeroing out proxy check");
i2pFirefox.setProxyTimeoutTime(0);
}
if (!arg.startsWith("-")) {