bump versions

config.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Improves Tor Browser support"
+export GITHUB_NAME="Improves Tor Browser support, removes unnecessary static variables"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md)
-export GITHUB_TAG=1.0.6
+export GITHUB_TAG=1.0.7

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sun Jan 01 00:59:21 UTC 2023
+#Sun Jan 01 02:32:56 UTC 2023
-build.number=430
+build.number=438

src/java/net/i2p/i2pfirefox/I2PBrowser.java

@@ -77,7 +77,7 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
 
   private void launchFirefox(int privateWindow, String[] url) {
     logger.info("I2PFirefox" + privateWindow);
-    I2PFirefox.usability = usability;
+    i2pFirefox.usability = usability;
     if (outputConfig)
       i2pFirefox.storeFirefoxDefaults();
     i2pFirefox.launch(privateWindow, url);

src/java/net/i2p/i2pfirefox/I2PFirefox.java

@@ -30,7 +30,7 @@ import java.util.stream.Stream;
 public class I2PFirefox extends I2PFirefoxProfileUnpacker {
   private final String[] FIREFOX_SEARCH_PATHS = FIREFOX_FINDER();
   private Process process = null;
-  public static boolean usability = false;
+  public boolean usability = false;
 
   private String baseMode() {
     if (usability)
@@ -854,10 +854,10 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
                 "private browsing is true, profile will be discarded at end of session");
           }
           if (arg.equals("-usability")) {
-            usability = true;
+            i2pFirefox.usability = true;
           }
           if (arg.equals("-app")) {
-            usability = true;
+            i2pFirefox.usability = true;
             privateBrowsing = 2;
           }
           if (arg.equals("-noproxycheck")) {

src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java

@@ -416,31 +416,29 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
     return "";
   }
 
-  /*
   public static void main(String[] args) {
-    validateUserDir();
+    I2PGenericUnsafeBrowser i2pBrowser = new I2PGenericUnsafeBrowser();
+    i2pBrowser.validateUserDir();
     boolean privateBrowsing = false;
-    logger.info("checking for private browsing");
+    i2pBrowser.logger.info("checking for private browsing");
     ArrayList<String> visitURL = new ArrayList<String>();
     if (args != null) {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
             privateBrowsing = true;
-            logger.info(
+            i2pBrowser.logger.info(
-                "private browsing is true, profile will be discarded at end of
+                "private browsing is true, profile will be discarded at end of session");
-  session");
           }
           if (!arg.startsWith("-")) {
             // check if it's a URL
-            visitURL.add(ValidURL(arg));
+            visitURL.add(i2pBrowser.ValidURL(arg));
           }
         }
       }
     }
-    logger.info("I2PGenericUnsafeBrowser");
+    i2pBrowser.logger.info("I2PGenericUnsafeBrowser");
-    I2PGenericUnsafeBrowser i2pBrowser = new I2PGenericUnsafeBrowser();
     i2pBrowser.launch(privateBrowsing,
                       visitURL.toArray(new String[visitURL.size()]));
-  }*/
+  }
 }

test/test-unsafe.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env sh
 
 ant distclean
-ant jar
+cd src && ant jar && cd ..
 
 echo "Testing UNSAFE auto-selector with no private and no URL parameters."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser 2> gen.0.err 1> gen.0.log