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

MainActivity starts CharonVpnService if a VpnProfile is clicked in the list

Browse Source 
This is done by implementing the OnVpnProfileSelectedListener interface
provided by VpnProfileListFragment.
This commit is contained in:
Tobias Brunner
2012-08-13 11:00:25 +02:00
parent c8b942a1e2
commit 0b362ed837
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
+32 -7
View File
@@ -18,7 +18,11 @@
package org.strongswan.android.ui; package org.strongswan.android.ui;
import org.strongswan.android.R; import org.strongswan.android.R;
import org.strongswan.android.data.VpnProfile;
import org.strongswan.android.data.VpnProfileDataSource;
import org.strongswan.android.logic.CharonVpnService;
import org.strongswan.android.logic.TrustedCertificateManager; import org.strongswan.android.logic.TrustedCertificateManager;
import org.strongswan.android.ui.VpnProfileListFragment.OnVpnProfileSelectedListener;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
@@ -30,15 +34,17 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.Window; import android.view.Window;
public class MainActivity extends Activity public class MainActivity extends Activity implements OnVpnProfileSelectedListener
{ {
private static final int PREPARE_VPN_SERVICE = 0;
private VpnProfile activeProfile;
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.main); setContentView(R.layout.main);
startVpnService();
ActionBar bar = getActionBar(); ActionBar bar = getActionBar();
bar.setDisplayShowTitleEnabled(false); bar.setDisplayShowTitleEnabled(false);
@@ -96,26 +102,45 @@ public class MainActivity extends Activity
} }
} }
/**
* Prepare the VpnService. If this succeeds the current VPN profile is
* started.
*/
protected void prepareVpnService() protected void prepareVpnService()
{ {
Intent intent = VpnService.prepare(this); Intent intent = VpnService.prepare(this);
if (intent != null) if (intent != null)
{ {
startActivityForResult(intent, 0); startActivityForResult(intent, PREPARE_VPN_SERVICE);
} }
else else
{ {
onActivityResult(0, RESULT_OK, null); onActivityResult(PREPARE_VPN_SERVICE, RESULT_OK, null);
} }
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) protected void onActivityResult(int requestCode, int resultCode, Intent data)
{ {
if (resultCode == RESULT_OK) switch (requestCode)
{ {
Intent intent = new Intent(this, CharonVpnService.class); case PREPARE_VPN_SERVICE:
startService(intent); if (resultCode == RESULT_OK && activeProfile != null)
{
Intent intent = new Intent(this, CharonVpnService.class);
intent.putExtra(VpnProfileDataSource.KEY_ID, activeProfile.getId());
this.startService(intent);
}
break;
default:
super.onActivityResult(requestCode, resultCode, data);
} }
} }
@Override
public void onVpnProfileSelected(VpnProfile profile)
{
activeProfile = profile;
prepareVpnService();
}
} }