From 5ceb82f87fb4f94984d3720f68187bf6ba00d1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 6 Sep 2013 12:54:24 +0200
Subject: Removing unnecessary fields from ProviderItem.

I'm targeting to refactor the whole ProviderItem class because I've not
used the Provider class so far and I should not duplicate information
from "Provider" into "ProviderItem".
---
 src/se/leap/bitmaskclient/ProviderListContent.java | 77 ++++++----------------
 1 file changed, 21 insertions(+), 56 deletions(-)

(limited to 'src/se/leap/bitmaskclient/ProviderListContent.java')

diff --git a/src/se/leap/bitmaskclient/ProviderListContent.java b/src/se/leap/bitmaskclient/ProviderListContent.java
index 75d91733..42cac792 100644
--- a/src/se/leap/bitmaskclient/ProviderListContent.java
+++ b/src/se/leap/bitmaskclient/ProviderListContent.java
@@ -55,23 +55,14 @@ public class ProviderListContent {
 
 	/**
 	 * A provider item.
-	 */
+	 */
 	public static class ProviderItem {
-
-	    
 		final public static String CUSTOM = "custom";
 		final public static String DANGER_ON = "danger_on";
-	    
-		public boolean custom = false;
-		public String id;
-		public String name;
-		public String domain;
-		public String provider_json_url;
-		public JSONObject provider_json;
-		public String provider_json_filename;
-		public String eip_service_json_url;
-		public String cert_json_url;
-		public boolean danger_on = false;
+		private boolean custom = false;
+		private String provider_json_url;
+		private String name;
+		private boolean danger_on = false;
 
 		/**
 		 * @param name of the provider
@@ -85,19 +76,11 @@ public class ProviderListContent {
 				byte[] urls_file_bytes = new byte[urls_file_input_stream.available()];
 				urls_file_input_stream.read(urls_file_bytes);
 				String urls_file_content = new String(urls_file_bytes);
-				JSONObject file_contents = new JSONObject(urls_file_content);
-				id = name;
-				this.name = name;
+				JSONObject file_contents = new JSONObject(urls_file_content);
 				provider_json_url = file_contents.getString(Provider.DOT_JSON_URL);
-				domain = new URL(provider_json_url).getHost();
-				//provider_json_filename = file_contents.getString("assets_json_provider");
-				eip_service_json_url = file_contents.getString("json_eip_service");
-				cert_json_url = file_contents.getString(EIP.CERTIFICATE);
+				this.name = name;
 				this.custom = custom;
 				this.danger_on = danger_on;
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
 			} catch (JSONException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -113,38 +96,20 @@ public class ProviderListContent {
 		 * @param provider_json already downloaded
 		 * @param custom if it's a new provider entered by the user or not
 		 * @param danger_on if the user trusts completely the new provider
-		 */
-		public ProviderItem(String name, String provider_json_url, JSONObject provider_json, boolean custom, boolean danger_on) {
-
-			try {
-				id = name;
-				//this.name = name;
-				this.provider_json_url = provider_json_url;
-				this.provider_json = provider_json;
-				this.name = provider_json.getJSONObject("name").getString("en");
-				domain = new URL(provider_json_url).getHost();
-				eip_service_json_url = provider_json.getString(Provider.API_URL) + "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.SERVICE_API_PATH;
-				cert_json_url = provider_json.getString("ca_cert_uri");
-				this.custom = custom;
-				this.danger_on = danger_on;
-				if(custom)
-					provider_json_filename = name + "_provider.json".replaceFirst("__", "_");
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (JSONException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		@Override
-		public String toString() {
-			return name;
-		}
-
-		public String getName() {
-			return id;
+		 */
+		public ProviderItem(String name, String provider_json_url, boolean custom, boolean danger_on) {
+			this.name = name;
+			this.provider_json_url = provider_json_url;
+			this.custom = custom;
+			this.danger_on = danger_on;
 		}
+		
+		public String name() { return name; }
+		
+		public boolean custom() { return custom; }
+		
+		public String providerJsonUrl() { return provider_json_url; }
+		
+		public boolean completelyTrusted() { return danger_on; }
 	}
 }
-- 
cgit v1.2.3