From d94eabbc4919b8484262d31abc996376917d46d4 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 6 Nov 2017 01:17:57 +0100
Subject: #8777 fixes NPEs and errorneous provider selection

---
 app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java')

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;
-- 
cgit v1.2.3