From 7932f484643b9d3bb93cc4cfa0b5c60308e67227 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 1 Apr 2019 02:02:59 +0200
Subject: [PATCH] catch NPE in ProviderManager
---
app/src/main/java/se/leap/bitmaskclient/ProviderManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
index a36c2dec2..dd9070af5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
@@ -110,7 +110,7 @@ public class ProviderManager implements AdapteeCollection<Provider> {
this.externalFilesDir = externalFilesDir;
customProviders = externalFilesDir != null && externalFilesDir.isDirectory() ?
providersFromFiles(externalFilesDir.list()) :
- new HashSet<Provider>();
+ new HashSet<>();
customProviderURLs = getProviderUrlSetFromProviderSet(customProviders);
}
@@ -121,7 +121,7 @@ public class ProviderManager implements AdapteeCollection<Provider> {
String mainUrl = extractMainUrlFromInputStream(getInputStreamFrom(externalFilesDir.getAbsolutePath() + "/" + file));
providers.add(new Provider(new URL(mainUrl)));
}
- } catch (MalformedURLException | FileNotFoundException e) {
+ } catch (MalformedURLException | FileNotFoundException | NullPointerException e) {
e.printStackTrace();
}
--
GitLab