I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

Factor out functions in WinLauncher

Browse Source
This commit is contained in:
idk
2022-09-11 00:03:30 -04:00
parent 733167ea8d
commit bfcdabd794
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
java/net/i2p/router/WinLauncher.java
View File

@@ -84,11 +84,12 @@ public class WinLauncher {
} }
} }
} }
File programs = programFile(); File programs = programFile();
File home = homeDir(); File home = homeDir();
if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst, proxyTimeoutTime, newArgsList)) { if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
proxyTimeoutTime, newArgsList)) {
System.exit(0); System.exit(0);
} }
@@ -115,10 +116,9 @@ public class WinLauncher {
registrationThread.setDaemon(true); registrationThread.setDaemon(true);
registrationThread.start(); registrationThread.start();
setNotRunning(); setNotStarting();
// wupp.i2pRouter.runRouter(); // wupp.i2pRouter.runRouter();
RouterLaunch.main(args); RouterLaunch.main(args);
} }
private static void setupLauncher() { private static void setupLauncher() {
@@ -135,14 +135,14 @@ public class WinLauncher {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
setRunning(); setStarting();
File jrehome = javaHome(); File jrehome = javaHome();
logger.info("jre home is: " + jrehome.getAbsolutePath()); logger.info("jre home is: " + jrehome.getAbsolutePath());
File appimagehome = appImageHome(); File appimagehome = appImageHome();
logger.info("appimage home is: " + appimagehome.getAbsolutePath()); logger.info("appimage home is: " + appimagehome.getAbsolutePath());
} }
private static File programFile(){ private static File programFile() {
File programs = selectProgramFile(); File programs = selectProgramFile();
if (!programs.exists()) if (!programs.exists())
programs.mkdirs(); programs.mkdirs();
@@ -155,7 +155,7 @@ public class WinLauncher {
return programs; return programs;
} }
private static File homeDir(){ private static File homeDir() {
File home = selectHome(); File home = selectHome();
if (!home.exists()) if (!home.exists())
home.mkdirs(); home.mkdirs();
@@ -180,14 +180,14 @@ public class WinLauncher {
i2pBrowser.chromiumFirst = chromiumFirst; i2pBrowser.chromiumFirst = chromiumFirst;
i2pBrowser.firefox = !chromiumFirst; i2pBrowser.firefox = !chromiumFirst;
i2pBrowser.chromium = chromiumFirst; i2pBrowser.chromium = chromiumFirst;
if (chromiumFirst){ if (chromiumFirst) {
logger.warning("favoring Chromium instead of Firefox"); logger.warning("favoring Chromium instead of Firefox");
} }
i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime); i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime);
System.out.println("I2PBrowser"); System.out.println("I2PBrowser");
String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]); String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]);
i2pBrowser.launch(privateBrowsing, newArgs); i2pBrowser.launch(privateBrowsing, newArgs);
setNotRunning(); setNotStarting();
return true; return true;
} }
return false; return false;
@@ -212,12 +212,14 @@ public class WinLauncher {
// check if there's something listening on port 7654(I2CP) // check if there's something listening on port 7654(I2CP)
if (!isAvailable(7654)) if (!isAvailable(7654))
return true; return true;
if (checkStarting())
return true;
if (checkPing()) if (checkPing())
return true; return true;
return false; return false;
} }
private static void setNotRunning() { private static void setNotStarting() {
logger.info("removing startup file, the application has started"); logger.info("removing startup file, the application has started");
File home = selectHome(); File home = selectHome();
File starting = new File(home, "starting"); File starting = new File(home, "starting");
@@ -225,8 +227,8 @@ public class WinLauncher {
starting.delete(); starting.delete();
} }
} }
private static void setRunning() { private static void setStarting() {
logger.info("creating startup file, router is starting up"); logger.info("creating startup file, router is starting up");
File home = selectHome(); File home = selectHome();
File starting = new File(home, "starting"); File starting = new File(home, "starting");
@@ -239,7 +241,7 @@ public class WinLauncher {
} }
} }
private static boolean checkRunning() { private static boolean checkStarting() {
logger.info("checking startup file"); logger.info("checking startup file");
File home = selectHome(); File home = selectHome();
File starting = new File(home, "starting"); File starting = new File(home, "starting");
@@ -248,7 +250,7 @@ public class WinLauncher {
return true; return true;
} }
logger.info("startup file does not exist but we're running now"); logger.info("startup file does not exist but we're running now");
setRunning(); setStarting();
return false; return false;
} }
@@ -272,7 +274,7 @@ public class WinLauncher {
} }
private static boolean i2pIsRunning() { private static boolean i2pIsRunning() {
if (checkRunning()) if (checkStarting())
return true; return true;
if (checkPing()) if (checkPing())
return true; return true;