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

android: Reset error state after user confirmed it

Browse Source 
This allows other listeners to change their display.
This commit is contained in:
Tobias Brunner
2018-07-03 11:31:34 +02:00
parent 52aaffdeb4
commit 6e73a939a9
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
+5 -14
View File
@@ -51,7 +51,6 @@ import java.util.List;
public class VpnStateFragment extends Fragment implements VpnStateListener public class VpnStateFragment extends Fragment implements VpnStateListener
{ {
private static final String KEY_ERROR_CONNECTION_ID = "error_connection_id"; private static final String KEY_ERROR_CONNECTION_ID = "error_connection_id";
private static final String KEY_DISMISSED_CONNECTION_ID = "dismissed_connection_id";
private TextView mProfileNameView; private TextView mProfileNameView;
private TextView mProfileView; private TextView mProfileView;
@@ -63,7 +62,6 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private ProgressBar mProgress; private ProgressBar mProgress;
private AlertDialog mErrorDialog; private AlertDialog mErrorDialog;
private long mErrorConnectionID; private long mErrorConnectionID;
private long mDismissedConnectionID;
private VpnStateService mService; private VpnStateService mService;
private final ServiceConnection mServiceConnection = new ServiceConnection() private final ServiceConnection mServiceConnection = new ServiceConnection()
{ {
@@ -96,11 +94,9 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
mServiceConnection, Service.BIND_AUTO_CREATE); mServiceConnection, Service.BIND_AUTO_CREATE);
mErrorConnectionID = 0; mErrorConnectionID = 0;
mDismissedConnectionID = 0;
if (savedInstanceState != null && savedInstanceState.containsKey(KEY_ERROR_CONNECTION_ID)) if (savedInstanceState != null && savedInstanceState.containsKey(KEY_ERROR_CONNECTION_ID))
{ {
mErrorConnectionID = (Long)savedInstanceState.getSerializable(KEY_ERROR_CONNECTION_ID); mErrorConnectionID = (Long)savedInstanceState.getSerializable(KEY_ERROR_CONNECTION_ID);
mDismissedConnectionID = (Long)savedInstanceState.getSerializable(KEY_DISMISSED_CONNECTION_ID);
} }
} }
@@ -110,7 +106,6 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putSerializable(KEY_ERROR_CONNECTION_ID, mErrorConnectionID); outState.putSerializable(KEY_ERROR_CONNECTION_ID, mErrorConnectionID);
outState.putSerializable(KEY_DISMISSED_CONNECTION_ID, mDismissedConnectionID);
} }
@Override @Override
@@ -241,14 +236,6 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private boolean reportError(long connectionID, String name, ErrorState error, ImcState imcState) private boolean reportError(long connectionID, String name, ErrorState error, ImcState imcState)
{ {
if (connectionID > mDismissedConnectionID)
{ /* report error if it hasn't been dismissed yet */
mErrorConnectionID = connectionID;
}
else
{ /* ignore all other errors */
error = ErrorState.NO_ERROR;
}
if (error == ErrorState.NO_ERROR) if (error == ErrorState.NO_ERROR)
{ {
hideErrorDialog(); hideErrorDialog();
@@ -258,6 +245,7 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
{ /* we already show the dialog */ { /* we already show the dialog */
return true; return true;
} }
mErrorConnectionID = connectionID;
mProfileNameView.setText(name); mProfileNameView.setText(name);
showProfile(true); showProfile(true);
mProgress.setVisibility(View.GONE); mProgress.setVisibility(View.GONE);
@@ -319,8 +307,11 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
if (mService != null) if (mService != null)
{ {
mService.disconnect(); mService.disconnect();
if (mService.getConnectionID() == mErrorConnectionID)
{
mService.setError(ErrorState.NO_ERROR);
}
} }
mDismissedConnectionID = mErrorConnectionID;
updateView(); updateView();
} }