r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed Lite build error

Browse Source
This commit is contained in:
Anthony Restaino 2016-01-22 08:19:45 -05:00
parent da4985d4de
commit 68a4475ec7
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/LightningLite/java/acr/browser/lightning/utils/ProxyUtils.java
View File

@ -1,15 +1,15 @@
package acr.browser.lightning.utils; package acr.browser.lightning.utils;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.util.Log; import android.util.Log;
import com.squareup.otto.Bus;
import net.i2p.android.ui.I2PAndroidHelper; import net.i2p.android.ui.I2PAndroidHelper;
import javax.inject.Inject;
import javax.inject.Singleton;
import acr.browser.lightning.R; import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp; import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.bus.BrowserEvents; import acr.browser.lightning.bus.BrowserEvents;
@ -18,30 +18,18 @@ import acr.browser.lightning.preference.PreferenceManager;
import info.guardianproject.netcipher.proxy.OrbotHelper; import info.guardianproject.netcipher.proxy.OrbotHelper;
import info.guardianproject.netcipher.web.WebkitProxy; import info.guardianproject.netcipher.web.WebkitProxy;
/** @Singleton
* 6/4/2015 Anthony Restaino
*/
public class ProxyUtils { public class ProxyUtils {
// Helper // Helper
private final I2PAndroidHelper mI2PHelper;
private static boolean mI2PHelperBound; private static boolean mI2PHelperBound;
private static boolean mI2PProxyInitialized; private static boolean mI2PProxyInitialized;
private final PreferenceManager mPreferences;
private static ProxyUtils mInstance;
private final Bus mEventBus; @Inject PreferenceManager mPreferences;
@Inject I2PAndroidHelper mI2PHelper;
private ProxyUtils(Context context) { @Inject
mPreferences = BrowserApp.getPreferenceManager(); public ProxyUtils() {
mEventBus = BrowserApp.getBus(); BrowserApp.getAppComponent().inject(this);
mI2PHelper = new I2PAndroidHelper(context.getApplicationContext());
}
public static ProxyUtils getInstance() {
if (mInstance == null) {
mInstance = new ProxyUtils(BrowserApp.getContext());
}
return mInstance;
} }
/* /*
@ -152,10 +140,12 @@ public class ProxyUtils {
public boolean isProxyReady() { public boolean isProxyReady() {
if (mPreferences.getProxyChoice() == Constants.PROXY_I2P) { if (mPreferences.getProxyChoice() == Constants.PROXY_I2P) {
if (!mI2PHelper.isI2PAndroidRunning()) { if (!mI2PHelper.isI2PAndroidRunning()) {
mEventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.i2p_not_running)); BrowserApp.getBus()
.post(new BrowserEvents.ShowSnackBarMessage(R.string.i2p_not_running));
return false; return false;
} else if (!mI2PHelper.areTunnelsActive()) { } else if (!mI2PHelper.areTunnelsActive()) {
mEventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.i2p_tunnels_not_ready)); BrowserApp.getBus()
.post(new BrowserEvents.ShowSnackBarMessage(R.string.i2p_tunnels_not_ready));
return false; return false;
} }
} }
@ -206,7 +196,7 @@ public class ProxyUtils {
break; break;
case Constants.PROXY_I2P: case Constants.PROXY_I2P:
I2PAndroidHelper ih = new I2PAndroidHelper(activity.getApplicationContext()); I2PAndroidHelper ih = new I2PAndroidHelper(BrowserApp.getContext());
if (!ih.isI2PAndroidInstalled()) { if (!ih.isI2PAndroidInstalled()) {
choice = Constants.NO_PROXY; choice = Constants.NO_PROXY;
ih.promptToInstall(activity); ih.promptToInstall(activity);