3 files changed, 2 insertions, 12 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
index e1f65b5e..22af1bfb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
@@ -11,7 +11,6 @@ import se.leap.bitmaskclient.BuildConfig;
 public class BuildConfigHelper {
 
     public interface BuildConfigHelperInterface {
-        boolean useObfsVpn();
         boolean hasObfuscationPinningDefaults();
         String obfsvpnIP();
         String obfsvpnPort();
@@ -21,10 +20,6 @@ public class BuildConfigHelper {
     }
 
     public static class DefaultBuildConfigHelper implements BuildConfigHelperInterface {
-        @Override
-        public boolean useObfsVpn() {
-            return BuildConfig.use_obfsvpn;
-        }
 
         @Override
         public boolean hasObfuscationPinningDefaults() {
@@ -72,10 +67,6 @@ public class BuildConfigHelper {
         instance = helperInterface;
     }
 
-    public static boolean useObfsVpn() {
-        return instance.useObfsVpn();
-    }
-
     public static boolean hasObfuscationPinningDefaults() {
         return instance.hasObfuscationPinningDefaults();
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/FileHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/FileHelper.java
index f1d86876..9d29911b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/FileHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/FileHelper.java
@@ -70,7 +70,7 @@ public class FileHelper {
                 }
                 reader.close();
                 return sb.toString();
-            } catch (IOException errabi) {
+            } catch (NullPointerException | IOException errabi) {
                 return null;
             }
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
index eee3bfb2..8d1f21e5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
@@ -513,8 +513,7 @@ public class PreferenceHelper {
     }
 
     public static boolean useObfuscationPinning() {
-        return BuildConfigHelper.useObfsVpn() &&
-                getUseBridges() &&
+        return getUseBridges() &&
                 getBoolean(USE_OBFUSCATION_PINNING, false) &&
                 !TextUtils.isEmpty(getObfuscationPinningIP()) &&
                 !TextUtils.isEmpty(getObfuscationPinningCert()) &&