Danger code removed from release apk.

I've copied all files containing "danger" to both release and debug java folders (solution learnt from http://stackoverflow.com/questions/18782368/android-gradle-buildtypes-duplicate-class), and removed every trace of any "danger" related code in the release apk.
This way, we make sure nobody can exploit that unused variable in production mode, so that if Android fails to protect our app (people have been able to introduce code into signed apks, so it's not impossible), we make it difficult to bypass the SSL certificate verification. You can call me paranoid if you want ;)

1 files changed, 112 insertions, 0 deletions

diff --git a/bitmask_android/src/debug/java/se/leap/bitmaskclient/ProviderListContent.java b/bitmask_android/src/debug/java/se/leap/bitmaskclient/ProviderListContent.java
new file mode 100644
index 00000000..e1ca4f9a
--- /dev/null
+++ b/bitmask_android/src/debug/java/se/leap/bitmaskclient/ProviderListContent.java
@@ -0,0 +1,112 @@
+/**

+ * 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("/.*", "");

+			}

+		}

+	}

+}