remove unused code - move constant 'danger_on' for insecure test builds to Constants

7 files changed, 8 insertions, 170 deletions

diff --git a/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java
index 10608a14..102a72c3 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java
@@ -9,10 +9,10 @@ import android.widget.RelativeLayout;
 
 import butterknife.InjectView;
 import butterknife.Optional;
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
 
 import static android.widget.RelativeLayout.BELOW;
 import static android.widget.RelativeLayout.LEFT_OF;
+import static se.leap.bitmaskclient.Constants.DANGER_ON;
 
 public class AddProviderActivity extends AddProviderBaseActivity {
 
@@ -36,14 +36,14 @@ public class AddProviderActivity extends AddProviderBaseActivity {
 
         checkboxDanger.setVisibility(View.VISIBLE);
         checkboxDanger.setText(R.string.danger_checkbox);
-        checkboxDanger.setChecked(preferences.getBoolean(ProviderItem.DANGER_ON, false));
+        checkboxDanger.setChecked(preferences.getBoolean(DANGER_ON, false));
     }
 
     @Override
     public void setupSaveButton() {
         saveButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                preferences.edit().putBoolean(ProviderItem.DANGER_ON, checkboxDanger.isChecked()).apply();
+                preferences.edit().putBoolean(DANGER_ON, checkboxDanger.isChecked()).apply();
                 saveProvider();
             }
         });
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
index fc91d7e4..e86ab8ea 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
@@ -50,6 +50,7 @@ import se.leap.bitmaskclient.utils.ConfigHelper;
 
 import static android.text.TextUtils.isEmpty;
 import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.Constants.DANGER_ON;
 import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
 import static se.leap.bitmaskclient.ProviderAPI.ERRORS;
@@ -94,7 +95,7 @@ public class ProviderApiManager extends ProviderApiManagerBase {
         Bundle currentDownload = new Bundle();
 
         if (task != null) {
-            lastDangerOn = task.containsKey(ProviderListContent.ProviderItem.DANGER_ON) && task.getBoolean(ProviderListContent.ProviderItem.DANGER_ON);
+            lastDangerOn = task.containsKey(DANGER_ON) && task.getBoolean(DANGER_ON);
         }
 
         if (isEmpty(provider.getMainUrlString()) || provider.getMainUrl().isDefault()) {
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderDetailActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderDetailActivity.java
index cf9ee5f5..9f2fa284 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderDetailActivity.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderDetailActivity.java
@@ -7,7 +7,7 @@ public class ProviderDetailActivity extends AbstractProviderDetailActivity {
     @Override
     public void onBackPressed() {
         SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(ProviderListContent.ProviderItem.DANGER_ON).apply();
+        editor.remove(Constants.DANGER_ON).apply();
         super.onBackPressed();
     }
 
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
index 9107e641..5ea5d174 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
@@ -24,8 +24,6 @@ import android.support.v4.app.FragmentTransaction;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-
 import static se.leap.bitmaskclient.ProviderAPI.SET_UP_PROVIDER;
 import static se.leap.bitmaskclient.ProviderSetupInterface.ProviderConfigState.SETTING_UP_PROVIDER;
 
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java
deleted file mode 100644
index 88e31c9a..00000000
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java
+++ /dev/null
@@ -1,82 +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.util.*;
-import java.net.*;
-
-/**
- * Models the provider list shown in the ProviderListActivity.
- *
- * @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 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;
-        }
-
-        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("/.*", "");
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Constants.java b/app/src/main/java/se/leap/bitmaskclient/Constants.java
index 0cbf82e1..5ed28806 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Constants.java
@@ -37,6 +37,8 @@ public interface Constants {
     String APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE = "configure always-on profile";
     String DEFAULT_BITMASK = "normal";
     String CUSTOM_BITMASK = "custom";
+    String DANGER_ON = "danger_on";
+
 
     String ASK_TO_CANCEL_VPN = "ask_to_cancel_vpn";
 
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java
deleted file mode 100644
index d9e1d1a9..00000000
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java
+++ /dev/null
@@ -1,81 +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.util.*;
-import java.net.*;
-
-/**
- * Models the provider list shown in the ProviderListActivity.
- *
- * @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";
-        private String provider_main_url;
-        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;
-        }
-
-        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("/.*", "");
-            }
-        }
-    }
-}