Removed unused imports and unused .eip variables

8 files changed, 74 insertions, 72 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/Constants.java b/app/src/main/java/se/leap/bitmaskclient/eip/Constants.java
index b710d780..e1a7e616 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/Constants.java
@@ -34,8 +34,6 @@ public interface Constants {
     public final static String ACTION_UPDATE_EIP_SERVICE = TAG + ".UPDATE_EIP_SERVICE";
     public final static String ACTION_IS_EIP_RUNNING = TAG + ".IS_RUNNING";
     public final static String EIP_NOTIFICATION = TAG + ".EIP_NOTIFICATION";
-    public final static String STATUS = TAG + ".STATUS";
-    public final static String DATE_FROM_CERTIFICATE = TAG + ".DATE_FROM_CERTIFICATE";
     public final static String ALLOWED_ANON = "allow_anonymous";
     public final static String ALLOWED_REGISTERED = "allow_registration";
     public final static String CERTIFICATE = "cert";
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index 379fb246..5169ef62 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -16,22 +16,40 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import android.app.*;
-import android.content.*;
-import android.os.*;
+import android.app.Activity;
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.ResultReceiver;
 import android.util.Log;
-import java.io.*;
-import java.security.cert.*;
-import java.text.*;
-import java.util.*;
-import org.json.*;
 
-import de.blinkt.openvpn.*;
-import de.blinkt.openvpn.activities.*;
-import de.blinkt.openvpn.core.*;
-import se.leap.bitmaskclient.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import static se.leap.bitmaskclient.eip.Constants.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import de.blinkt.openvpn.LaunchVPN;
+import de.blinkt.openvpn.VpnProfile;
+import de.blinkt.openvpn.core.ProfileManager;
+import se.leap.bitmaskclient.Dashboard;
+import se.leap.bitmaskclient.EipServiceFragment;
+import se.leap.bitmaskclient.Provider;
+
+import static se.leap.bitmaskclient.eip.Constants.ACTION_CHECK_CERT_VALIDITY;
+import static se.leap.bitmaskclient.eip.Constants.ACTION_IS_EIP_RUNNING;
+import static se.leap.bitmaskclient.eip.Constants.ACTION_START_EIP;
+import static se.leap.bitmaskclient.eip.Constants.ACTION_STOP_EIP;
+import static se.leap.bitmaskclient.eip.Constants.ACTION_UPDATE_EIP_SERVICE;
+import static se.leap.bitmaskclient.eip.Constants.CERTIFICATE;
+import static se.leap.bitmaskclient.eip.Constants.KEY;
+import static se.leap.bitmaskclient.eip.Constants.PARSED_SERIAL;
+import static se.leap.bitmaskclient.eip.Constants.RECEIVER_TAG;
+import static se.leap.bitmaskclient.eip.Constants.REQUEST_TAG;
 
 /**
  * EIP is the abstract base class for interacting with and managing the Encrypted
@@ -80,21 +98,21 @@ public final class EIP extends IntentService {
 	String action = intent.getAction();
 	mReceiver = intent.getParcelableExtra(RECEIVER_TAG);
 	
-	if ( action == ACTION_START_EIP )
+	if ( action.equals(ACTION_START_EIP))
 	    startEIP();
-	else if ( action == ACTION_STOP_EIP )
+	else if (action.equals(ACTION_STOP_EIP))
 	    stopEIP();
-	else if ( action == ACTION_IS_EIP_RUNNING )
+	else if (action.equals(ACTION_IS_EIP_RUNNING))
 	    isRunning();
-	else if ( action == ACTION_UPDATE_EIP_SERVICE )
+	else if (action.equals(ACTION_UPDATE_EIP_SERVICE))
 	    updateEIPService();
-	else if ( action == ACTION_CHECK_CERT_VALIDITY )
+	else if (action.equals(ACTION_CHECK_CERT_VALIDITY))
 	    checkCertValidity();
     }
 	
     /**
      * Initiates an EIP connection by selecting a gateway and preparing and sending an
-     * Intent to {@link se.leap.openvpn.LaunchVPN}.
+     * Intent to {@link de.blinkt.openvpn.LaunchVPN}.
      * It also sets up early routes.
      */
     private void startEIP() {
@@ -164,8 +182,7 @@ public final class EIP extends IntentService {
     }
 
     /**
-     * Loads eip-service.json from SharedPreferences and calls {@link updateGateways()}
-     * to parse gateway definitions.
+     * Loads eip-service.json from SharedPreferences, delete previous vpn profiles and add new gateways.
      * TODO Implement API call to refresh eip-service.json from the provider
      */
     private void updateEIPService() {
@@ -210,7 +227,7 @@ public final class EIP extends IntentService {
 	    // TODO Auto-generated catch block
 	    e.printStackTrace();
 	}
-	preferences.edit().putInt(PARSED_SERIAL, eip_definition.optInt(Provider.API_RETURN_SERIAL)).commit();
+	preferences.edit().putInt(PARSED_SERIAL, eip_definition.optInt(Provider.API_RETURN_SERIAL)).apply();
     }
 
     private boolean isOpenVpnGateway(JSONObject gateway) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
index 82c3ceb8..4ac3bd6a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
@@ -17,18 +17,17 @@
 package se.leap.bitmaskclient.eip;
 
 import android.util.Log;
-import java.util.*;
 
-import de.blinkt.openvpn.core.*;
+import java.util.Observable;
+
+import de.blinkt.openvpn.core.VpnStatus;
 
 public class EipStatus extends Observable implements VpnStatus.StateListener {
     public static String TAG = EipStatus.class.getSimpleName();
     private static EipStatus current_status;
 
-    private static EipStatus previous_status;
     private static VpnStatus.ConnectionStatus level = VpnStatus.ConnectionStatus.LEVEL_NOTCONNECTED;
     private static boolean wants_to_disconnect = false;
-    private static boolean is_disconnecting = false;
 
     private String state, log_message;
     private int localized_res_id;
@@ -46,7 +45,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
     @Override
     public void updateState(final String state, final String logmessage, final int localizedResId, final VpnStatus.ConnectionStatus level) {
 	current_status = getInstance();
-	previous_status = current_status;
 	current_status.setState(state);
 	current_status.setLogMessage(logmessage);
 	current_status.setLocalizedResId(localizedResId);
@@ -60,10 +58,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
 	current_status.notifyObservers();
     }
 
-    public boolean isDisconnecting() {
-	return is_disconnecting;
-    }
-
     public boolean wantsToDisconnect() {
 	return wants_to_disconnect;
     }
@@ -88,7 +82,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
     }
 
     public void setConnecting() {
-	is_disconnecting = false;
 	wants_to_disconnect = false;
 	current_status.setChanged();
 	current_status.notifyObservers();
@@ -96,21 +89,15 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
 
     public void setConnectedOrDisconnected() {
 	Log.d(TAG, "setConnectedOrDisconnected()");
-	is_disconnecting = false;
 	wants_to_disconnect = false;
 	current_status.setChanged();
 	current_status.notifyObservers();
     }
 
     public void setDisconnecting() {
-	is_disconnecting = true;
 	wants_to_disconnect = false;
     }
 
-    public void setWantsToDisconnect() {
-	wants_to_disconnect = true;
-    }
-
     public String getState() {
 	return state;
     }
@@ -127,10 +114,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
 	return level;
     }
 
-    public EipStatus getPreviousStatus() {
-	return previous_status;
-    }
-
     private void setState(String state) {
 	this.state = state;
     }
@@ -144,7 +127,7 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
     }
 
     private void setLevel(VpnStatus.ConnectionStatus level) {
-	this.level = level;
+	EipStatus.level = level;
     }
 
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
index 6aa66ac0..3ee9443c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
@@ -17,16 +17,22 @@
 package se.leap.bitmaskclient.eip;
 
 import android.app.Activity;
-import android.content.*;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
-import java.io.*;
-import java.util.*;
-import org.json.*;
 
-import de.blinkt.openvpn.*;
-import de.blinkt.openvpn.activities.*;
-import de.blinkt.openvpn.core.*;
-import se.leap.bitmaskclient.*;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Collection;
+import java.util.Iterator;
+
+import de.blinkt.openvpn.VpnProfile;
+import de.blinkt.openvpn.core.ConfigParser;
+import de.blinkt.openvpn.core.ProfileManager;
+import se.leap.bitmaskclient.Dashboard;
 
 /**
  * Gateway provides objects defining gateways and their metadata.
@@ -103,9 +109,8 @@ public class Gateway {
     private JSONObject getLocationInfo(JSONObject eip_definition) {
 	try {
 	    JSONObject locations = eip_definition.getJSONObject("locations");
-	    JSONObject location = locations.getJSONObject(mGateway.getString("location"));
 
-	    return location;
+	    return locations.getJSONObject(mGateway.getString("location"));
 	} catch (JSONException e) {
 	    return new JSONObject();
 	}
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaySelector.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaySelector.java
index 36b5fb41..39ae7ca6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaySelector.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaySelector.java
@@ -1,8 +1,10 @@
 package se.leap.bitmaskclient.eip;
 
-import java.security.cert.*;
-import java.util.*;
-import org.json.*;
+import java.util.Calendar;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeMap;
 
 public class GatewaySelector {
     List<Gateway> gateways;
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
index 224e3bd4..a6f9fe76 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -1,11 +1,7 @@
 package se.leap.bitmaskclient.eip;
 
 import android.content.Intent;
-import android.os.Process;
 import android.net.VpnService;
-import android.util.Log;
-
-import static se.leap.bitmaskclient.eip.Constants.*;
 
 public class VoidVpnService extends VpnService  {
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
index 16ae6a85..6487f6c1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
@@ -17,12 +17,13 @@
 package se.leap.bitmaskclient.eip;
 
 import android.util.Log;
-import java.util.*;
-import java.security.cert.*;
-import java.text.*;
+
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Calendar;
 
 import se.leap.bitmaskclient.ConfigHelper;
-import static se.leap.bitmaskclient.eip.Constants.*;
 
 public class VpnCertificateValidator {
     public final static String TAG = VpnCertificateValidator.class.getSimpleName();
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
index 8e36f53c..0c8e9a04 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
@@ -18,13 +18,14 @@ package se.leap.bitmaskclient.eip;
 
 import android.content.SharedPreferences;
 import android.util.Log;
-import java.util.Iterator;
-import java.util.Vector;
+
 import org.json.JSONArray;
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
 
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.Provider;
 
 public class VpnConfigGenerator {
 
@@ -38,7 +39,7 @@ public class VpnConfigGenerator {
     public VpnConfigGenerator(SharedPreferences preferences, JSONObject general_configuration, JSONObject gateway) {
 	this.general_configuration = general_configuration;
 	this.gateway = gateway;
-	this.preferences = preferences;
+	VpnConfigGenerator.preferences = preferences;
     }
     
     public String generate() {
@@ -56,7 +57,6 @@ public class VpnConfigGenerator {
 	String common_options = "";
 	try {
 	    Iterator keys = general_configuration.keys();
-	    Vector<Vector<String>> value = new Vector<Vector<String>>();
 	    while ( keys.hasNext() ){
 		String key = keys.next().toString();