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

android: Just reconnect if the tile is clicked even if there was an error 

A long press click on the tile (or a click on the notification) will open
the main activity if more information about the error are necessary.
This commit is contained in:
Tobias Brunner 2018-06-12 17:06:28 +02:00
parent be89310784
commit d56f1bf832
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnTileService.java
View File

@ -131,10 +131,7 @@ public class VpnTileService extends TileService implements VpnStateService.VpnSt
{
profile = getProfile();
}
/* open the main activity in case of an error. since the state is still CONNECTING
* there is a popup confirmation dialog if we connect again, disconnect would work
* but doing two operations is not ideal */
/* reconnect the profile in case of an error */
if (mService.getErrorState() == VpnStateService.ErrorState.NO_ERROR)
{
switch (mService.getState())
@ -159,15 +156,15 @@ public class VpnTileService extends TileService implements VpnStateService.VpnSt
}
return;
}
if (profile != null)
{
Intent intent = new Intent(this, VpnProfileControlActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setAction(VpnProfileControlActivity.START_PROFILE);
intent.putExtra(VpnProfileControlActivity.EXTRA_VPN_PROFILE_ID, profile.getUUID().toString());
startActivity(intent);
return;
}
}
if (profile != null)
{
Intent intent = new Intent(this, VpnProfileControlActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setAction(VpnProfileControlActivity.START_PROFILE);
intent.putExtra(VpnProfileControlActivity.EXTRA_VPN_PROFILE_ID, profile.getUUID().toString());
startActivity(intent);
return;
}
}
Intent intent = new Intent(this, MainActivity.class);