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

remove proxy prefs, parse bridge URLs, and format strings! 

- shouldn't set proxy prefs for Orweb as it conflicts with Orbot's own pref keys
- improve parsing of incoming bridge URLs, as they may not have protocol component in URI
- format strings of up/down values better
This commit is contained in:
Nathan Freitas 2015-03-17 13:03:16 -04:00
parent 56df927fb5
commit 3e2b8cff1e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,11 +705,6 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
} }
else else
{ {
Editor e = mPrefs.edit();
e.putString("pref_proxy_host", "localhost");
e.putInt("pref_proxy_port", 8118);
e.putString("prof_proxy_type","HTTP");
e.commit();
//use the built-in browser //use the built-in browser
Intent intentBrowser = new Intent(this, Browser.class); Intent intentBrowser = new Intent(this, Browser.class);
@ -717,7 +712,6 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
intentBrowser.setData(Uri.parse(browserLaunchUrl)); intentBrowser.setData(Uri.parse(browserLaunchUrl));
startActivity(intentBrowser); startActivity(intentBrowser);
} }
} }
@ -814,6 +808,11 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
try { try {
results = URLDecoder.decode(results, "UTF-8"); results = URLDecoder.decode(results, "UTF-8");
int urlIdx = results.indexOf("://");
if (urlIdx!=-1)
results = results.substring(urlIdx+3);
setNewBridges(results); setNewBridges(results);
@ -1188,9 +1187,9 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
//Locale.getDefault(); //Locale.getDefault();
if (count < 1e6) if (count < 1e6)
return mNumberFormat.format(((float)((int)(count*10/1024))/10)) + getString(R.string.kbps); return mNumberFormat.format(Math.round(((float)((int)(count*10/1024))/10))) + getString(R.string.kbps);
return mNumberFormat.format(((float)((int)(count*100/1024/1024))/100)) + getString(R.string.mbps); return mNumberFormat.format(Math.round(((float)((int)(count*100/1024/1024))/100))) + getString(R.string.mbps);
//return count+" kB"; //return count+" kB";
} }
@ -1200,9 +1199,9 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
// Under 2Mb, returns "xxx.xKb" // Under 2Mb, returns "xxx.xKb"
// Over 2Mb, returns "xxx.xxMb" // Over 2Mb, returns "xxx.xxMb"
if (count < 1e6) if (count < 1e6)
return mNumberFormat.format(((float)((int)(count*10/1024))/10)) + getString(R.string.kb); return mNumberFormat.format(Math.round(((float)((int)(count*10/1024))/10))) + getString(R.string.kb);
return mNumberFormat.format(((float)((int)(count*100/1024/1024))/100)) + getString(R.string.mb); return mNumberFormat.format(Math.round(((float)((int)(count*100/1024/1024))/100))) + getString(R.string.mb);
//return count+" kB"; //return count+" kB";
} }