denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-13 11:18:52 +02:00
parent bebe2d397e
commit 9c0be3ac69
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+11
View File
@@ -29,9 +29,12 @@ import org.strongswan.android.data.VpnProfile;
import org.strongswan.android.data.VpnProfileDataSource; import org.strongswan.android.data.VpnProfileDataSource;
import org.strongswan.android.logic.VpnStateService.ErrorState; import org.strongswan.android.logic.VpnStateService.ErrorState;
import org.strongswan.android.logic.VpnStateService.State; import org.strongswan.android.logic.VpnStateService.State;
import org.strongswan.android.ui.MainActivity;
import android.app.PendingIntent;
import android.app.Service; import android.app.Service;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.net.VpnService; import android.net.VpnService;
@@ -468,6 +471,14 @@ public class CharonVpnService extends VpnService implements Runnable
{ {
builder = new CharonVpnService.Builder(); builder = new CharonVpnService.Builder();
builder.setSession(name); 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) public synchronized boolean addAddress(String address, int prefixLength)