From a0b2197d8fc5507bc6e17f623b42e71f00feaaef Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 26 May 2015 10:52:58 +0000 Subject: [PATCH] Use constants for proxy choices --- .../browser/lightning/activity/BrowserActivity.java | 10 +++++----- .../browser/lightning/activity/SettingsActivity.java | 8 ++++---- .../java/acr/browser/lightning/constant/Constants.java | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java index 78f92b9..7b23d91 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -614,11 +614,11 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll int port; switch (mPreferences.getProxyChoice()) { - case 0: + case Constants.NO_PROXY: // We shouldn't be here return; - case 1: + case Constants.PROXY_ORBOT: OrbotHelper oh = new OrbotHelper(this); if (!oh.isOrbotRunning()) { oh.requestOrbotStart(this); @@ -627,7 +627,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll port = 8118; break; - case 2: + case Constants.PROXY_I2P: mI2PProxyInitialized = true; if (mI2PHelperBound && !mI2PHelper.isI2PAndroidRunning()) { mI2PHelper.requestI2PAndroidStart(this); @@ -651,7 +651,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll } public boolean isProxyReady() { - if (mPreferences.getProxyChoice() == 2) { + if (mPreferences.getProxyChoice() == Constants.PROXY_I2P) { if (!mI2PHelper.isI2PAndroidRunning()) { Utils.showToast(this, getString(R.string.i2p_not_running)); return false; @@ -1501,7 +1501,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @Override protected void onStart() { super.onStart(); - if (mPreferences.getProxyChoice() == 2) { + if (mPreferences.getProxyChoice() == Constants.PROXY_I2P) { // Try to bind to I2P Android mI2PHelper.bind(new I2PAndroidHelper.Callback() { @Override diff --git a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java index cd2bf9c..80e17ec 100644 --- a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java @@ -322,18 +322,18 @@ public class SettingsActivity extends ThemableSettingsActivity { private void setProxyChoice(int choice) { switch (choice) { - case 1: + case Constants.PROXY_ORBOT: OrbotHelper oh = new OrbotHelper(this); if (!oh.isOrbotInstalled()) { - choice = 0; + choice = Constants.NO_PROXY; Utils.showToast(mContext, getResources().getString(R.string.install_orbot)); } break; - case 2: + case Constants.PROXY_I2P: I2PAndroidHelper ih = new I2PAndroidHelper(this); if (!ih.isI2PAndroidInstalled()) { - choice = 0; + choice = Constants.NO_PROXY; ih.promptToInstall(this); } break; diff --git a/app/src/main/java/acr/browser/lightning/constant/Constants.java b/app/src/main/java/acr/browser/lightning/constant/Constants.java index f8a25ce..4c15eb9 100644 --- a/app/src/main/java/acr/browser/lightning/constant/Constants.java +++ b/app/src/main/java/acr/browser/lightning/constant/Constants.java @@ -38,4 +38,9 @@ public final class Constants { public static final String FILE = "file://"; public static final String FOLDER = "folder://"; public static final String TAG = "Lightning"; + + // These should match the order of @array/proxy_choices_array + public static final int NO_PROXY = 0; + public static final int PROXY_ORBOT = 1; + public static final int PROXY_I2P = 2; }