summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipFragment.java20
-rw-r--r--app/src/main/res/layout/eip_service_fragment.xml13
3 files changed, 1 insertions, 33 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) {
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 669abef0..fea0093e 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -15,23 +15,12 @@
android:text="@string/eip_service_label"
android:textAppearance="?android:attr/textAppearanceMedium" />
- <ProgressBar
- android:id="@+id/eipProgress"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@android:style/Widget.Holo.ProgressBar.Horizontal"
- android:indeterminate="true"
- android:visibility="gone"
- android:layout_below="@id/eipLabel"
- android:layout_marginLeft="15dp"
- android:layout_marginRight="15dp" />
-
<TextView
android:id="@+id/status_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_below="@id/eipProgress"
+ android:layout_below="@id/eipLabel"
android:layout_centerVertical="true"
android:paddingTop="5dp"
android:paddingBottom="10dp"