ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

android: Allow explicit termination of a profile without confirmation

This commit is contained in:
Tobias Brunner 2018-06-25 11:02:08 +02:00
parent baf2f47413
commit a2b3122865
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
View File

@ -315,15 +315,35 @@ public class VpnProfileControlActivity extends AppCompatActivity
/**
* Disconnect the current connection, if any (silently ignored if there is no connection).
*
* @param intent Intent that caused us to start this
*/
private void disconnect()
private void disconnect(Intent intent)
{
VpnProfile profile = null;
removeFragmentByTag(DIALOG_TAG);
String profileUUID = intent.getStringExtra(EXTRA_VPN_PROFILE_ID);
if (profileUUID != null)
{
VpnProfileDataSource dataSource = new VpnProfileDataSource(this);
dataSource.open();
profile = dataSource.getVpnProfile(profileUUID);
dataSource.close();
}
if (mService != null)
{
if (mService.getState() == State.CONNECTED || mService.getState() == State.CONNECTING)
if (mService.getState() == State.CONNECTED ||
mService.getState() == State.CONNECTING)
{
if (profile != null && profile.equals(mService.getProfile()))
{ /* allow explicit termination without confirmation */
mService.disconnect();
finish();
return;
}
Bundle args = new Bundle();
args.putBoolean(PROFILE_DISCONNECT, true);
@ -343,13 +363,15 @@ public class VpnProfileControlActivity extends AppCompatActivity
*/
private void handleIntent()
{
if (START_PROFILE.equals(getIntent().getAction()))
Intent intent = getIntent();
if (START_PROFILE.equals(intent.getAction()))
{
startVpnProfile(getIntent());
startVpnProfile(intent);
}
else if (DISCONNECT.equals(getIntent().getAction()))
else if (DISCONNECT.equals(intent.getAction()))
{
disconnect();
disconnect(intent);
}
}
@ -416,7 +438,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
{
activity.mService.disconnect();
}
getActivity().finish();
activity.finish();
}
};
DialogInterface.OnClickListener cancelListener = new DialogInterface.OnClickListener()