android: Change to CONNECTING state if CHILD_SA goes down

Unless we are disconnecting.  This currently triggers the connecting
dialog, perhaps just updating the status text would do too (when switching
from CONNECTED to CONNECTING, not from DISCONNECTED to CONNECTING).

diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index 31172ab44e752203aa59a65a6f57d7893227d791..13024512e2139a8a6d72232f76b7fda04f163c5a 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -354,7 +354,10 @@ public class CharonVpnService extends VpnService implements Runnable
                switch (status)
                {
                        case STATE_CHILD_SA_DOWN:
-                               /* we ignore this as we use closeaction=restart */
+                               if (!mIsDisconnecting)
+                               {
+                                       setState(State.CONNECTING);
+                               }
                                break;
                        case STATE_CHILD_SA_UP:
                                setState(State.CONNECTED);