keep a static ref to the router

BUILD.md

@@ -26,8 +26,8 @@ and automatically configure your `JAVA_HOME`.
 Currently, bundles are built with OpenJDK 19.
 
 ```sh
-sdk install java 1.19.0-open
+sdk install java 19.0.1-open
-sdk use java 1.19.0-open
+sdk use java 19.0.1-open
 ```
 
 Will automatically set up your OpenJDK 19.

java/net/i2p/router/MacLauncher.java

@@ -18,6 +18,7 @@ public class MacLauncher {
 
     /** this is totally undocumented */
     private static final String APP_PATH = "jpackage.app-path";
+    private static Router i2pRouter;
 
     public static void main(String[] args) throws Exception {
         String path = System.getProperty(APP_PATH,"unknown");
@@ -42,12 +43,30 @@ public class MacLauncher {
         }
 
 
+        i2pRouter = new Router(System.getProperties());
+
         Thread registrationThread = new Thread(REGISTER_UPP);
         registrationThread.setName("UPP Registration");
         registrationThread.setDaemon(true);
         registrationThread.start();
 
-        RouterLaunch.main(args);
+        String arch = System.getProperty("os.arch");
+        if (arch.equals("aarch64")) {
+            changeSetting(i2pRouter, "router.newsURL", "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/mac-arm64/stable/news.su3");
+            changeSetting(i2pRouter, "router.backupNewsURL", "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/mac-arm64/stable/news.su3");
+        } else {
+            changeSetting(i2pRouter, "router.newsURL", "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/mac/stable/news.su3");
+            changeSetting(i2pRouter, "router.backupNewsURL", "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/mac/stable/news.su3");
+        }
+
+        i2pRouter.runRouter();
+    }
+
+    private static void changeSetting(Router i2pRouter, String key, String value){
+        String setting = i2pRouter.getConfigSetting(key);
+        if (setting == null) {
+            i2pRouter.saveConfig(key, value);
+        }
     }
 
     private static native void disableAppNap();