From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 18 Jun 2018 14:30:26 +0000 (+0200)
Subject: android: Don't hide the notification if we are connecting to a profile
X-Git-Tag: 5.7.0dr5~20^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc52868173d490de0efdff3c48b608d92102e015;p=thirdparty%2Fstrongswan.git

android: Don't hide the notification if we are connecting to a profile

In particular, if we are reconnecting after an error.
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index 9b1bcff299..b0c12985ed 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -331,7 +331,10 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 				deinitializeCharon();
 				Log.i(TAG, "charon stopped");
 				mCurrentProfile = null;
-				removeNotification();
+				if (mNextProfile == null)
+				{	/* don't remove the notification if we are connecting to a different profile */
+					removeNotification();
+				}
 			}
 		}
 	}