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

android: Allow reconnecting without confirmation in case of an error

Browse Source
This commit is contained in:
Tobias Brunner
2018-07-03 11:31:35 +02:00
parent 6987ddb313
commit be89310784
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
+20 -2
View File
@@ -191,6 +191,24 @@ public class VpnProfileControlActivity extends AppCompatActivity
}
}
/**
* Check if we are currently connected to a VPN connection
*
* @return true if currently connected
*/
private boolean isConnected()
{
if (mService == null)
{
return false;
}
if (mService.getErrorState() != VpnStateService.ErrorState.NO_ERROR)
{ /* allow reconnecting (even to a different profile) without confirmation if there is an error */
return false;
}
return (mService.getState() == State.CONNECTED || mService.getState() == State.CONNECTING);
}
/**
* Start the given VPN profile
*
@@ -207,9 +225,9 @@ public class VpnProfileControlActivity extends AppCompatActivity
removeFragmentByTag(DIALOG_TAG);
if (mService != null && (mService.getState() == State.CONNECTED || mService.getState() == State.CONNECTING))
if (isConnected())
{
profileInfo.putBoolean(PROFILE_RECONNECT, mService.getProfile().getId() == profile.getId());
profileInfo.putBoolean(PROFILE_RECONNECT, mService.getProfile().getUUID().equals(profile.getUUID()));
ConfirmationDialog dialog = new ConfirmationDialog();
dialog.setArguments(profileInfo);