Merge branch 'integrate_obfsvpn' into 'master'

update bitmaskcore, integrating obfsvpn

See merge request leap/bitmask_android!190

1 files changed, 7 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
index ca1261a8..8ac5baf0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
@@ -274,4 +274,11 @@ public class ConfigHelper {
         return matcher.matches();
     }
 
+    // ObfsVpnHelper class allows us to mock BuildConfig.use_obfsvpn while
+    // not mocking the whole ConfigHelper class
+    public static class ObfsVpnHelper {
+        public static boolean useObfsVpn() {
+            return BuildConfig.use_obfsvpn;
+        }
+    }
 }