diff options
author | Parménides GV <parmegv@sdf.org> | 2015-04-15 13:01:10 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-04-15 13:01:10 +0200 |
commit | 106502134068155563f877966e1c5b0edfae2d51 (patch) | |
tree | 7685a467593481fbb6bad604cc6a2b327c933911 /app/src/main/java/se/leap/bitmaskclient/EipFragment.java | |
parent | 435bf8afa374eab51cc87390db999e28386432b9 (diff) |
Wants to disconnect and is connecting work fine.
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EipFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipFragment.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java index 02eedd77..bfa67815 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java @@ -50,7 +50,6 @@ public class EipFragment extends Fragment implements Observer { private static Dashboard dashboard; private static EIPReceiver mEIPReceiver; private static EipStatus eip_status; - private boolean is_starting_to_connect; private boolean wants_to_connect; public void onAttach(Activity activity) { @@ -180,7 +179,7 @@ public class EipFragment extends Fragment implements Observer { public void startEipFromScratch() { wants_to_connect = false; - is_starting_to_connect = true; + eip_status.setConnecting(); progress_bar.setVisibility(View.VISIBLE); eip_switch.setVisibility(View.VISIBLE); String status = dashboard.getString(R.string.eip_status_start_pending); @@ -269,7 +268,7 @@ public class EipFragment extends Fragment implements Observer { private void handleNewState(EipStatus eip_status) { if (eip_status.wantsToDisconnect()) setDisconnectedUI(); - else if (eip_status.isConnecting() || is_starting_to_connect) + else if (eip_status.isConnecting()) setInProgressUI(eip_status); else if (eip_status.isConnected()) setConnectedUI(); @@ -280,7 +279,6 @@ public class EipFragment extends Fragment implements Observer { private void setConnectedUI() { hideProgressBar(); adjustSwitch(); - is_starting_to_connect = false; status_message.setText(dashboard.getString(R.string.eip_state_connected)); } @@ -296,7 +294,7 @@ public class EipFragment extends Fragment implements Observer { } private void adjustSwitch() { - if (eip_status.isConnected() || eip_status.isConnecting() || is_starting_to_connect) { + if (eip_status.isConnected() || eip_status.isConnecting()) { if (!eip_switch.isChecked()) { eip_switch.setChecked(true); } @@ -315,7 +313,6 @@ public class EipFragment extends Fragment implements Observer { showProgressBar(); status_message.setText(prefix + " " + logmessage); - is_starting_to_connect = false; adjustSwitch(); } |