[tor-commits] [orbot/master] removed unused interface

[n8fr8 at torproject.org]

commit feb3de3b4b907bcbd9c78522197027355036965b
Author: bim <dsnake at protonmail.com>
Date:   Sat Nov 28 12:55:46 2020 -0500

    removed unused interface
---
 .../main/java/org/torproject/android/MainConstants.java   | 15 ---------------
 .../java/org/torproject/android/OrbotMainActivity.java    |  5 +++--
 .../android/ui/onboarding/CustomBridgesActivity.java      |  6 +++---
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/MainConstants.java b/app/src/main/java/org/torproject/android/MainConstants.java
deleted file mode 100644
index e08f4e4b..00000000
--- a/app/src/main/java/org/torproject/android/MainConstants.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.torproject.android;
-
-public interface MainConstants {
-
-    //EXIT COUNTRY CODES
-    String[] COUNTRY_CODES = {"DE", "AT", "SE", "CH", "IS", "CA", "US", "ES", "FR", "BG", "PL", "AU", "BR", "CZ", "DK", "FI", "GB", "HU", "NL", "JP", "RO", "RU", "SG", "SK"};
-
-    //path to check Tor against
-    String URL_TOR_CHECK = "https://check.torproject.org";
-
-    String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges";
-
-    String EMAIL_TOR_BRIDGES = "bridges at torproject.org";
-
-}
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index abc87cc0..83f321e9 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -90,8 +90,6 @@ import java.util.StringTokenizer;
 import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
 import static androidx.core.content.FileProvider.getUriForFile;
-import static org.torproject.android.MainConstants.COUNTRY_CODES;
-import static org.torproject.android.MainConstants.URL_TOR_CHECK;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START_VPN;
 import static org.torproject.android.service.TorServiceConstants.ACTION_STOP_VPN;
@@ -115,6 +113,9 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
     private static final int MESSAGE_PORTS = 3;
     private static final float ROTATE_FROM = 0.0f;
     private static final float ROTATE_TO = 360.0f * 4f;// 3.141592654f * 32.0f;
+    private static final String[] COUNTRY_CODES = {"DE", "AT", "SE", "CH", "IS", "CA", "US", "ES", "FR", "BG", "PL", "AU", "BR", "CZ", "DK", "FI", "GB", "HU", "NL", "JP", "RO", "RU", "SG", "SK"};
+    private static final String URL_TOR_CHECK = "https://check.torproject.org";
+    ;
     // this is what takes messages or values from the callback threads or other non-mainUI threads
     // and passes them back into the main UI thread for display to the user
     private final Handler mStatusUpdateHandler = new MainActivityStatusUpdateHandler(this);
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
index 6fce9852..f20ba4ff 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
@@ -37,11 +37,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 
-import static org.torproject.android.MainConstants.EMAIL_TOR_BRIDGES;
-import static org.torproject.android.MainConstants.URL_TOR_BRIDGES;
-
 public class CustomBridgesActivity extends AppCompatActivity implements TextWatcher {
 
+    private static final String EMAIL_TOR_BRIDGES = "bridges at torproject.org";
+    private static final String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges";
+
     private EditText mEtPastedBridges;
 
     // configures an EditText we assume to be multiline and nested in a ScrollView to be independently scrollable