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

android: Change progress dialog handling

Browse Source 
With the previous code the dialog sometimes was hidden for a short while
before it got reopened.
This commit is contained in:
Tobias Brunner
2013-09-26 13:53:25 +02:00
parent cfed5679b8
commit 00f7b29422
1 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
+41 -24
View File
@@ -57,6 +57,8 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private TextView mStateView;
private int stateBaseColor;
private Button mActionButton;
private ProgressDialog mConnectDialog;
private ProgressDialog mDisconnectDialog;
private ProgressDialog mProgressDialog;
private AlertDialog mErrorDialog;
private long mErrorConnectionID;
@@ -192,7 +194,6 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
return;
}
hideProgressDialog();
enableActionButton(false);
mProfileNameView.setText(name);
@@ -200,6 +201,7 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
{
case DISABLED:
showProfile(false);
hideProgressDialog();
mStateView.setText(R.string.state_disabled);
mStateView.setTextColor(stateBaseColor);
break;
@@ -211,6 +213,7 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
break;
case CONNECTED:
showProfile(true);
hideProgressDialog();
enableActionButton(true);
mStateView.setText(R.string.state_connected);
mStateView.setTextColor(getResources().getColor(R.color.success_text));
@@ -295,6 +298,7 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
{
mProgressDialog.dismiss();
mProgressDialog = null;
mDisconnectDialog = mConnectDialog = null;
}
}
@@ -315,33 +319,46 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
private void showConnectDialog(String profile, String gateway)
{
mProgressDialog = new ProgressDialog(getActivity());
mProgressDialog.setTitle(String.format(getString(R.string.connecting_title), profile));
mProgressDialog.setMessage(String.format(getString(R.string.connecting_message), gateway));
mProgressDialog.setIndeterminate(true);
mProgressDialog.setCancelable(false);
mProgressDialog.setButton(getString(android.R.string.cancel),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
if (mService != null)
{
mService.disconnect();
}
}
});
mProgressDialog.show();
if (mConnectDialog != null)
{ /* already showing the dialog */
return;
}
hideProgressDialog();
mConnectDialog = new ProgressDialog(getActivity());
mConnectDialog.setTitle(String.format(getString(R.string.connecting_title), profile));
mConnectDialog.setMessage(String.format(getString(R.string.connecting_message), gateway));
mConnectDialog.setIndeterminate(true);
mConnectDialog.setCancelable(false);
mConnectDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
getString(android.R.string.cancel),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
if (mService != null)
{
mService.disconnect();
}
}
});
mConnectDialog.show();
mProgressDialog = mConnectDialog;
}
private void showDisconnectDialog(String profile)
{
mProgressDialog = new ProgressDialog(getActivity());
mProgressDialog.setMessage(getString(R.string.state_disconnecting));
mProgressDialog.setIndeterminate(true);
mProgressDialog.setCancelable(false);
mProgressDialog.show();
if (mDisconnectDialog != null)
{ /* already showing the dialog */
return;
}
hideProgressDialog();
mDisconnectDialog = new ProgressDialog(getActivity());
mDisconnectDialog.setMessage(getString(R.string.state_disconnecting));
mDisconnectDialog.setIndeterminate(true);
mDisconnectDialog.setCancelable(false);
mDisconnectDialog.show();
mProgressDialog = mDisconnectDialog;
}
private void showErrorDialog(int textid)