From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 9 Aug 2012 09:38:18 +0000 (+0200)
Subject: Show MainActiviy if the user clicks 'Configure' in Android's VPN dialog
X-Git-Tag: 5.0.1~210^2~18
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9c0be3ac6999b4cca137d7a3f578b822333e344b;p=thirdparty%2Fstrongswan.git

Show MainActiviy if the user clicks 'Configure' in Android's VPN dialog
---

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 58730c0085..2938075a6c 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -29,9 +29,12 @@ import org.strongswan.android.data.VpnProfile;
 import org.strongswan.android.data.VpnProfileDataSource;
 import org.strongswan.android.logic.VpnStateService.ErrorState;
 import org.strongswan.android.logic.VpnStateService.State;
+import org.strongswan.android.ui.MainActivity;
 
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.net.VpnService;
@@ -468,6 +471,14 @@ public class CharonVpnService extends VpnService implements Runnable
 		{
 			builder = new CharonVpnService.Builder();
 			builder.setSession(name);
+
+			/* even though the option displayed in the system dialog says "Configure"
+			 * we just use our main Activity */
+			Context context = getApplicationContext();
+			Intent intent = new Intent(context, MainActivity.class);
+			PendingIntent pending = PendingIntent.getActivity(context, 0, intent,
+															  Intent.FLAG_ACTIVITY_NEW_TASK);
+			builder.setConfigureIntent(pending);
 		}
 
 		public synchronized boolean addAddress(String address, int prefixLength)