#8777 fixes NPEs and errorneous provider selection

1 files changed, 4 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java
index caa48231..15440330 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java
@@ -788,6 +788,10 @@ public abstract class ProviderApiBase extends IntentService {
 
     //FIXME: don't save private keys in shared preferences! use the keystore
     protected boolean loadCertificate(String cert_string) {
+        if (cert_string == null) {
+            return false;
+        }
+
         try {
             // API returns concatenated cert & key.  Split them for OpenVPN options
             String certificateString = null, keyString = null;