diff options
author | Parménides GV <parmegv@sdf.org> | 2015-04-16 13:20:45 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-04-22 12:36:39 +0200 |
commit | 8862197a0a138f942e9c76a29aaf189f4c5141b4 (patch) | |
tree | e1528deb4309f1e4d97ac89482f72afd1c678fc0 /app/src/main/java/se/leap | |
parent | 90c28f492b800b706c1d6f14482baf3e75c4be7e (diff) |
Remove progress bar.
Diffstat (limited to 'app/src/main/java/se/leap')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 1 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipFragment.java | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index 4207872d..d5d06322 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -373,7 +373,6 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn protected void providerApiCommand(Bundle parameters, int progressbar_message_resId, String providerApi_action) { if (eip_fragment != null && progressbar_message_resId != 0) { - eip_fragment.progress_bar.setVisibility(ProgressBar.VISIBLE); setStatusMessage(progressbar_message_resId); } diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java index a9ceec52..bed61d24 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java @@ -42,8 +42,6 @@ public class EipFragment extends Fragment implements Observer { @InjectView(R.id.status_message) TextView status_message; - @InjectView(R.id.eipProgress) - ProgressBar progress_bar; @InjectView(R.id.vpn_Status_Image) FabButton vpn_status_image; @@ -176,7 +174,6 @@ public class EipFragment extends Fragment implements Observer { public void startEipFromScratch() { wants_to_connect = false; eip_status.setConnecting(); - progress_bar.setVisibility(View.VISIBLE); String status = dashboard.getString(R.string.eip_status_start_pending); status_message.setText(status); @@ -197,9 +194,6 @@ public class EipFragment extends Fragment implements Observer { } protected void stopEipIfPossible() { - - hideProgressBar(); - String message = dashboard.getString(R.string.eip_state_not_connected); status_message.setText(message); @@ -268,13 +262,11 @@ public class EipFragment extends Fragment implements Observer { } private void setConnectedUI() { - hideProgressBar(); adjustSwitch(); status_message.setText(dashboard.getString(R.string.eip_state_connected)); } private void setDisconnectedUI() { - hideProgressBar(); adjustSwitch(); if (eip_status.errorInLast(5, dashboard.getApplicationContext()) && !status_message.getText().toString().equalsIgnoreCase(dashboard.getString(R.string.eip_state_not_connected))) { @@ -304,26 +296,14 @@ public class EipFragment extends Fragment implements Observer { String logmessage = eip_status.getLogMessage(); String prefix = dashboard.getString(localizedResId); - showProgressBar(); status_message.setText(prefix + " " + logmessage); adjustSwitch(); } private void updatingCertificateUI() { - showProgressBar(); status_message.setText(getString(R.string.updating_certificate_message)); } - private void showProgressBar() { - if (progress_bar != null) - progress_bar.setVisibility(View.VISIBLE); - } - - private void hideProgressBar() { - if (progress_bar != null) - progress_bar.setVisibility(View.GONE); - } - protected class EIPReceiver extends ResultReceiver { protected EIPReceiver(Handler handler) { |