5 files changed, 35 insertions, 51 deletions
diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
index f5e78e65..2b35080b 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -28,10 +28,10 @@ import java.net.*;
 import java.util.*;
 
 import butterknife.*;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.*;
 import org.json.*;
 
-import javax.inject.Inject;
+import javax.inject.*;
 
 import se.leap.bitmaskclient.DownloadFailedDialog.DownloadFailedDialogInterface;
 import se.leap.bitmaskclient.NewProviderDialog.NewProviderDialogInterface;
diff --git a/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
index f6709c22..96437eb2 100644
--- a/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -16,20 +16,13 @@
  */
 package se.leap.bitmaskclient;
 
-import butterknife.ButterKnife;
-import butterknife.InjectView;
+import butterknife.*;
 import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Toast;
+import android.app.*;
+import android.content.*;
+import android.os.*;
+import android.view.*;
+import android.widget.*;
 
 /**
  * Implements the new custom provider dialog.
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index c8fd0251..7f0ce001 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -16,19 +16,19 @@
  */
 package se.leap.bitmaskclient;
 
-import android.app.IntentService;
+import android.app.*;
 import android.content.*;
 import android.os.*;
 import android.util.*;
 import java.io.*;
-import java.math.BigInteger;
+import java.math.*;
 import java.net.*;
 import java.security.*;
 import java.security.cert.*;
-import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.*;
 import java.util.*;
 import javax.net.ssl.*;
-import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.*;
 import org.json.*;
 
 import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java
index 97ce5245..0f978290 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java
@@ -1,17 +1,16 @@
-package se.leap.bitmaskclient;
-
-import org.json.*;
-
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.eip.Constants;
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-
-import android.app.*;
-import android.content.*;
-import android.os.Bundle;
-import android.view.*;
-import android.widget.TextView;
-
+package se.leap.bitmaskclient;
+
+import org.json.*;
+
+import se.leap.bitmaskclient.eip.*;
+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+
+import android.app.*;
+import android.content.*;
+import android.os.*;
+import android.view.*;
+import android.widget.*;
+
 public class ProviderDetailFragment extends DialogFragment {
 
     final public static String TAG = "providerDetailFragment";
@@ -61,7 +60,7 @@ public class ProviderDetailFragment extends DialogFragment {
 	private boolean anon_allowed(JSONObject provider_json) {
 		try {
 			JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
-			return service_description.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON);
+			return service_description.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON);
 		} catch (JSONException e) {
 			return false;
 		}
@@ -80,8 +79,8 @@ public class ProviderDetailFragment extends DialogFragment {
 	public void onCancel(DialogInterface dialog) {
 		super.onCancel(dialog);
 		SharedPreferences.Editor editor = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit();
-		editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit();
-		interface_with_configuration_wizard.showAllProviders();
+		editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit();
+		interface_with_configuration_wizard.showAllProviders();
 	}
 
 	public static DialogFragment newInstance() {
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java
index a5402fd8..64e5be07 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java
@@ -16,17 +16,9 @@
  */
  package se.leap.bitmaskclient;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import java.io.*;
+import java.util.*;
+import java.net.*;
 
 /**
  * Models the provider list shown in the ConfigurationWizard.
@@ -55,19 +47,19 @@ public class ProviderListContent {
 
 	/**
 	 * A provider item.
-	 */
+	 */
 	public static class ProviderItem {
 		final public static String CUSTOM = "custom";
 		private String provider_main_url;
-		private String name;
+		private String name;
 
 		/**
 		 * @param name of the provider
 		 * @param provider_main_url used to download provider.json file of the provider
-		 */
+		 */
 		public ProviderItem(String name, String provider_main_url) {
 			this.name = name;
-			this.provider_main_url = provider_main_url;
+			this.provider_main_url = provider_main_url;
 		}
 		
 		public String name() { return name; }