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

launch the internal or system browser depending upon VPN mode

This commit is contained in:
Nathan Freitas 2015-02-04 16:07:45 -05:00
parent 1852cde041
commit 7f42265158
1 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,6 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
}; };
private void doLayout () private void doLayout ()
{ {
setContentView(R.layout.layout_main); setContentView(R.layout.layout_main);
@ -654,62 +653,27 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
/* /*
* 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(String browserLaunchUrl)
{ {
//startIntent("info.guardianproject.browser.Browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); //startIntent("info.guardianproject.browser.Browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl));
Intent intentBrowser = new Intent(this, Browser.class); if (mBtnVPN.isChecked())
intentBrowser.setAction(Intent.ACTION_VIEW);
intentBrowser.setData(Uri.parse(browserLaunchUrl));
startActivity(intentBrowser);
/**
boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser");
boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false);
if (isOrwebInstalled)
{
}
else if (isTransProxy)
{ {
//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));
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent); startActivity(intent);
} }
else else
{ {
AlertDialog aDialog = new AlertDialog.Builder(Orbot.this) //use the built-in browser
.setIcon(R.drawable.onion32) Intent intentBrowser = new Intent(this, Browser.class);
.setTitle(R.string.install_apps_) intentBrowser.setAction(Intent.ACTION_VIEW);
.setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) intentBrowser.setData(Uri.parse(browserLaunchUrl));
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener () startActivity(intentBrowser);
{
@Override
public void onClick(DialogInterface dialog, int which) {
//prompt to install Orweb
Intent intent = new Intent(Orbot.this,TipsAndTricks.class);
startActivity(intent);
} }
})
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener ()
{
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
})
.show();
}*/
} }