dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only ARM chips can support the new Obfs4, Meek bridges 

so hide the UI options that promote them, and just request
standard bridges
This commit is contained in:
Nathan Freitas 2015-04-12 22:56:16 -04:00
parent 8cbdf18733
commit 325ca1f809
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/torproject/android/OrbotMainActivity.java
View File

@ -274,19 +274,27 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
}); });
mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges);
boolean useBridges = mPrefs.getBoolean("pref_bridges_enabled", false); boolean useBridges = mPrefs.getBoolean("pref_bridges_enabled", false);
mBtnBridges.setChecked(useBridges); mBtnBridges.setChecked(useBridges);
mBtnBridges.setOnClickListener(new View.OnClickListener () mBtnBridges.setOnClickListener(new View.OnClickListener ()
{ {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (Build.CPU_ABI.contains("arm"))
promptSetupBridges (); {
promptSetupBridges (); //if ARM processor, show all bridge options
}
else
{
showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported
}
} }
@ -302,11 +310,9 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
return mGestureDetector.onTouchEvent(event); return mGestureDetector.onTouchEvent(event);
} }
/* /*
* Create the UI Options Menu (non-Javadoc) * Create the UI Options Menu (non-Javadoc)
* @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
@ -487,7 +493,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
private void doTorCheck () private void doTorCheck ()
{ {
openBrowser(URL_TOR_CHECK); openBrowser(URL_TOR_CHECK,false);
} }
@ -681,13 +687,12 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
/* /*
* Launch the system activity for Uri viewing with the provided url * Launch the system activity for Uri viewing with the provided url
*/ */
private void openBrowser(final String browserLaunchUrl) private void openBrowser(final String browserLaunchUrl,boolean forceExternal)
{ {
boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser");
boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false);
if (mBtnVPN.isChecked()||forceExternal)
if (mBtnVPN.isChecked())
{ {
//use the system browser since VPN is on //use the system browser since VPN is on
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
@ -964,7 +969,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
openBrowser(URL_TOR_BRIDGES + type); openBrowser(URL_TOR_BRIDGES + type,true);
} }