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

Keep reporting the error until the user dismisses it

Browse Source 
Even when the Activity is closed and later reopened.
This commit is contained in:
Tobias Brunner
2012-08-13 11:18:52 +02:00
parent 264dd8d372
commit bebe2d397e
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
+40 -3
View File
@@ -45,6 +45,9 @@ import android.widget.TextView;
public class VpnStateFragment extends Fragment implements VpnStateListener public class VpnStateFragment extends Fragment implements VpnStateListener
{ {
private static final String KEY_ERROR = "error";
private static final String KEY_NAME = "name";
private TextView mProfileNameView; private TextView mProfileNameView;
private TextView mProfileView; private TextView mProfileView;
private TextView mStateView; private TextView mStateView;
@@ -53,6 +56,8 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private ProgressDialog mProgressDialog; private ProgressDialog mProgressDialog;
private State mState; private State mState;
private AlertDialog mErrorDialog; private AlertDialog mErrorDialog;
private ErrorState mError;
private String mErrorProfileName;
private VpnStateService mService; private VpnStateService mService;
private final ServiceConnection mServiceConnection = new ServiceConnection() { private final ServiceConnection mServiceConnection = new ServiceConnection() {
@Override @Override
@@ -79,6 +84,22 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
Context context = getActivity().getApplicationContext(); Context context = getActivity().getApplicationContext();
context.bindService(new Intent(context, VpnStateService.class), context.bindService(new Intent(context, VpnStateService.class),
mServiceConnection, Service.BIND_AUTO_CREATE); mServiceConnection, Service.BIND_AUTO_CREATE);
mError = ErrorState.NO_ERROR;
if (savedInstanceState != null && savedInstanceState.containsKey(KEY_ERROR))
{
mError = (ErrorState)savedInstanceState.getSerializable(KEY_ERROR);
mErrorProfileName = savedInstanceState.getString(KEY_NAME);
}
}
@Override
public void onSaveInstanceState(Bundle outState)
{
super.onSaveInstanceState(outState);
outState.putSerializable(KEY_ERROR, mError);
outState.putString(KEY_NAME, mErrorProfileName);
} }
@Override @Override
@@ -205,8 +226,22 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private boolean reportError(String name, State state, ErrorState error) private boolean reportError(String name, State state, ErrorState error)
{ {
if (error == ErrorState.NO_ERROR || state != State.CONNECTING && state != State.CONNECTED) if (mError != ErrorState.NO_ERROR)
{ /* we only report errors while initiating */ { /* we are currently reporting an error which was not yet dismissed */
error = mError;
name = mErrorProfileName;
}
else if (error != ErrorState.NO_ERROR && (state == State.CONNECTING || state == State.CONNECTED))
{ /* while initiating we report errors */
mError = error;
mErrorProfileName = name;
}
else
{ /* ignore all other errors */
error = ErrorState.NO_ERROR;
}
if (error == ErrorState.NO_ERROR)
{
hideErrorDialog(); hideErrorDialog();
return false; return false;
} }
@@ -310,8 +345,10 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) public void onClick(DialogInterface dialog, int id)
{ { /* clear the error */
mError = ErrorState.NO_ERROR;
mErrorDialog = null; mErrorDialog = null;
updateView();
dialog.dismiss(); dialog.dismiss();
} }
}).create(); }).create();