summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2017-09-29 07:27:19 +0000
committercyberta <cyberta@riseup.net>2017-09-29 07:27:19 +0000
commitfc913a46cfc85c0bdb0c9d19b2c94c8b53f93b1f (patch)
tree247408a15cd7caf621206d574af61d0c16d25876 /app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
parent51afe1eeba990c2cd57bd842a96f7a756df51ce8 (diff)
parent7322b8e01f852bb4d0243a6ff2fc563422ba274c (diff)
Merge branch 'feature/updateDependencies' into 'master'
Feature/update dependencies See merge request leap/bitmask_android!8
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/VpnFragment.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnFragment.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
index 6ffeacc1..9e9adef1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
@@ -19,6 +19,7 @@ package se.leap.bitmaskclient;
import android.app.*;
import android.content.*;
import android.os.*;
+import android.util.Log;
import android.view.*;
import android.widget.*;
@@ -39,7 +40,7 @@ public class VpnFragment extends Fragment implements Observer {
protected static final String IS_CONNECTED = TAG + ".is_connected";
public static final String START_ON_BOOT = "start on boot";
- @InjectView(R.id.vpn_Status_Image)
+ @InjectView(R.id.vpn_status_image)
FabButton vpn_status_image;
@InjectView(R.id.vpn_main_button)
Button main_button;
@@ -91,7 +92,8 @@ public class VpnFragment extends Fragment implements Observer {
@Override
public void onResume() {
super.onResume();
- eipCommand(Constants.ACTION_CHECK_CERT_VALIDITY);
+ //FIXME: avoid race conditions while checking certificate an logging in at about the same time
+ //eipCommand(Constants.ACTION_CHECK_CERT_VALIDITY);
handleNewState(eip_status);
}