From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 .../se/leap/bitmaskclient/ProviderListContent.java | 112 ---------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java

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

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java
deleted file mode 100644
index e1ca4f9a..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (c) 2013 LEAP Encryption Access Project and contributers
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
- 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;
-
-/**
- * Models the provider list shown in the ConfigurationWizard.
- * 
- * @author parmegv
- *
- */
-public class ProviderListContent {
-
-	public static List<ProviderItem> ITEMS = new ArrayList<ProviderItem>();
-
-	public static Map<String, ProviderItem> ITEM_MAP = new HashMap<String, ProviderItem>();
-
-	/**
-	 * Adds a new provider item to the end of the items map, and to the items list.
-	 * @param item
-	 */
-	public static void addItem(ProviderItem item) {
-		ITEMS.add(item);
-		ITEM_MAP.put(String.valueOf(ITEMS.size()), item);
-	}
-	public static void removeItem(ProviderItem item) {
-		ITEMS.remove(item);
-		ITEM_MAP.remove(item);
-	}
-
-	/**
-	 * A provider item.
-	 */
-	public static class ProviderItem {
-		final public static String CUSTOM = "custom";
-		final public static String DANGER_ON = "danger_on";
-		private String provider_main_url;
-		private String name;
-
-		/**
-		 * @param name of the provider
-		 * @param urls_file_input_stream file input stream linking with the assets url file
-		 * @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, InputStream urls_file_input_stream) {
-
-			try {
-				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);
-				provider_main_url = file_contents.getString(Provider.MAIN_URL);
-				this.name = name;
-			} catch (JSONException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		/**
-		 * @param name of the provider
-		 * @param provider_main_url used to download provider.json file of the provider
-		 * @param provider_json already downloaded
-		 * @param custom if it's a new provider entered by the user or not
-		 */
-		public ProviderItem(String name, String provider_main_url) {
-			this.name = name;
-			this.provider_main_url = provider_main_url;
-		}
-		
-		public String name() { return name; }
-		
-		public String providerMainUrl() { return provider_main_url; }
-		
-		public String domain() {
-			try {
-				return new URL(provider_main_url).getHost();
-			} catch (MalformedURLException e) {
-				return provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", "");
-			}
-		}
-	}
-}
-- 
cgit v1.2.3