Changeset c4ebc73

Timestamp:

Jun 2, 2019 11:08:38 AM (10 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

aa0bafb

Parents:

471c5d4

Message:

TCG: Add new getInstance() method for Android
so instance with stale context is not returned.
Return null in Android for old method.

File:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java (modified) (3 diffs)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java

@@ -77 +77 @@
     /**
      *  In I2PAppContext will instantiate if necessary and always return non-null.
-     *  As of 0.9.4, when in RouterContext, will return null (except in Android)
+     *  As of 0.9.4, when in RouterContext, will return null
      *  if the TCG has not yet been started by the router.
+     *  As of 0.9.41, that's true for Android as well.
      *
      *  @throws IllegalArgumentException if unable to load from i2ptunnel.config
@@ -85 +86 @@
         synchronized (TunnelControllerGroup.class) {
             if (_instance == null) {
-                I2PAppContext ctx = I2PAppContext.getGlobalContext();
+                if (!SystemVersion.isAndroid()) {
+                    I2PAppContext ctx = I2PAppContext.getGlobalContext();
+                    if (!ctx.isRouterContext()) {
+                        _instance = new TunnelControllerGroup(ctx, null, null);
+                        _instance.startup();
+                    }
+                } // else wait for the router to start it
+            }
+            return _instance; 
+        }
+    }
+
+    /**
+     *  In I2PAppContext will instantiate if necessary and always return non-null.
+     *  When in RouterContext, will return null (except in Android)
+     *  if the TCG has not yet been started by the router.
+     *  In Android, if the old instance uses a stale context, it will replace it.
+     *
+     *  @throws IllegalArgumentException if unable to load from i2ptunnel.config
+     *  @since 0.9.41
+     */
+    public static TunnelControllerGroup getInstance(I2PAppContext ctx) { 
+        synchronized (TunnelControllerGroup.class) {
+            if (_instance == null) {
                 if (SystemVersion.isAndroid() || !ctx.isRouterContext()) {
                     _instance = new TunnelControllerGroup(ctx, null, null);
-                    if (!SystemVersion.isAndroid())
-                        _instance.startup();
+                    _instance.startup();
                 } // else wait for the router to start it
+            } else {
+                if (SystemVersion.isAndroid() && _instance._context != ctx) {
+                    ctx.logManager().getLog(TunnelControllerGroup.class).warn("Old context in TCG");
+                    _instance.shutdown();
+                    _instance = new TunnelControllerGroup(ctx, null, null);
+                 }
             }
             return _instance; 
@@ -121 +150 @@
         _sessions = new HashMap<I2PSession, Set<TunnelController>>(4);
         synchronized (TunnelControllerGroup.class) {
-            if (_instance == null)
+            if (_instance == null) {
                 _instance = this;
-        }
-        if (_instance != this) {
-            _log.logAlways(Log.WARN, "New TunnelControllerGroup, now you have two");
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("I did it", new Exception());
+            } else {
+                _log.logAlways(Log.WARN, "New TunnelControllerGroup, now you have two");
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("I did it", new Exception());
+            }
         }
         _state = INITIALIZED;