A bit of refactoring.

ConfigHelper checks for IllegalArgumentException (trace from play
store).
EIP location code has been splitted a bit.

I'd like to extract OVPNGateway out from EIP, but that's not an easy job
and this branch is already lasting to much hehehe.

1 files changed, 4 insertions, 1 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
index a8bd3b7a..c95d0c8b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
@@ -18,8 +18,9 @@ package se.leap.bitmaskclient;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.io.InputStream;
+import java.math.BigInteger;
+import java.lang.IllegalArgumentException;
 import java.security.KeyFactory;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -105,6 +106,8 @@ public class ConfigHelper {
 			e.printStackTrace();
 		} catch (IOException e) {
 			return null;
+		} catch (IllegalArgumentException e) {
+		    return null;
 		}
 		
 		return (X509Certificate) certificate;