sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

android: Handle restarts of the control Activity better

Browse Source 
For instance, rotating a device will restart it and this previously
could have started the wrong profile or shown the system's VPN
confirmation dialog twice.
This commit is contained in:
Tobias Brunner 2018-06-22 13:57:51 +02:00
parent 4db3bf0cb0
commit baf2f47413
1 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
public static final String EXTRA_VPN_PROFILE_ID = "org.strongswan.android.VPN_PROFILE_ID"; public static final String EXTRA_VPN_PROFILE_ID = "org.strongswan.android.VPN_PROFILE_ID";
private static final int PREPARE_VPN_SERVICE = 0; private static final int PREPARE_VPN_SERVICE = 0;
private static final String WAITING_FOR_RESULT = "WAITING_FOR_RESULT";
private static final String PROFILE_NAME = "PROFILE_NAME"; private static final String PROFILE_NAME = "PROFILE_NAME";
private static final String PROFILE_REQUIRES_PASSWORD = "REQUIRES_PASSWORD"; private static final String PROFILE_REQUIRES_PASSWORD = "REQUIRES_PASSWORD";
private static final String PROFILE_RECONNECT = "RECONNECT"; private static final String PROFILE_RECONNECT = "RECONNECT";
@ -57,6 +58,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
private static final String DIALOG_TAG = "Dialog"; private static final String DIALOG_TAG = "Dialog";
private Bundle mProfileInfo; private Bundle mProfileInfo;
private boolean mWaitingForResult;
private VpnStateService mService; private VpnStateService mService;
private final ServiceConnection mServiceConnection = new ServiceConnection() private final ServiceConnection mServiceConnection = new ServiceConnection()
{ {
@ -70,15 +72,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
public void onServiceConnected(ComponentName name, IBinder service) public void onServiceConnected(ComponentName name, IBinder service)
{ {
mService = ((VpnStateService.LocalBinder)service).getService(); mService = ((VpnStateService.LocalBinder)service).getService();
handleIntent();
if (START_PROFILE.equals(getIntent().getAction()))
{
startVpnProfile(getIntent());
}
else if (DISCONNECT.equals(getIntent().getAction()))
{
disconnect();
}
} }
}; };
@ -87,10 +81,21 @@ public class VpnProfileControlActivity extends AppCompatActivity
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (savedInstanceState != null)
{
mWaitingForResult = savedInstanceState.getBoolean(WAITING_FOR_RESULT, false);
}
this.bindService(new Intent(this, VpnStateService.class), this.bindService(new Intent(this, VpnStateService.class),
mServiceConnection, Service.BIND_AUTO_CREATE); mServiceConnection, Service.BIND_AUTO_CREATE);
} }
@Override
protected void onSaveInstanceState(Bundle outState)
{
super.onSaveInstanceState(outState);
outState.putBoolean(WAITING_FOR_RESULT, mWaitingForResult);
}
@Override @Override
protected void onDestroy() protected void onDestroy()
{ {
@ -109,13 +114,12 @@ public class VpnProfileControlActivity extends AppCompatActivity
{ {
super.onNewIntent(intent); super.onNewIntent(intent);
if (START_PROFILE.equals(intent.getAction())) /* store this intent in case the service is not yet connected or the activity is restarted */
setIntent(intent);
if (mService != null)
{ {
startVpnProfile(intent); handleIntent();
}
else if (DISCONNECT.equals(intent.getAction()))
{
disconnect();
} }
} }
@ -128,6 +132,13 @@ public class VpnProfileControlActivity extends AppCompatActivity
protected void prepareVpnService(Bundle profileInfo) protected void prepareVpnService(Bundle profileInfo)
{ {
Intent intent; Intent intent;
if (mWaitingForResult)
{
mProfileInfo = profileInfo;
return;
}
try try
{ {
intent = VpnService.prepare(this); intent = VpnService.prepare(this);
@ -150,6 +161,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
{ {
try try
{ {
mWaitingForResult = true;
startActivityForResult(intent, PREPARE_VPN_SERVICE); startActivityForResult(intent, PREPARE_VPN_SERVICE);
} }
catch (ActivityNotFoundException ex) catch (ActivityNotFoundException ex)
@ -159,6 +171,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
* com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog * com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog
* will not be found then */ * will not be found then */
VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported); VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported);
mWaitingForResult = false;
} }
} }
else else
@ -173,6 +186,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
switch (requestCode) switch (requestCode)
{ {
case PREPARE_VPN_SERVICE: case PREPARE_VPN_SERVICE:
mWaitingForResult = false;
if (resultCode == RESULT_OK && mProfileInfo != null) if (resultCode == RESULT_OK && mProfileInfo != null)
{ {
if (mService != null) if (mService != null)
@ -324,6 +338,21 @@ public class VpnProfileControlActivity extends AppCompatActivity
} }
} }
/**
* Handle the Intent of this Activity depending on its action
*/
private void handleIntent()
{
if (START_PROFILE.equals(getIntent().getAction()))
{
startVpnProfile(getIntent());
}
else if (DISCONNECT.equals(getIntent().getAction()))
{
disconnect();
}
}
/** /**
* Dismiss dialog if shown * Dismiss dialog if shown
*/ */