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

use one prefs instance

This commit is contained in:
Nathan Freitas 2014-06-13 12:59:02 -04:00
parent 2ce9ea92f1
commit c0f7d754dd
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/torproject/android/Orbot.java
View File

@ -86,15 +86,16 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
//should move this up with all the other class variables //should move this up with all the other class variables
private boolean mIsBound = false; private boolean mIsBound = false;
private SharedPreferences mPrefs = null;
private boolean autoStartFromIntent = false; private boolean autoStartFromIntent = false;
/** Called when the activity is first created. */ /** Called when the activity is first created. */
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
TorServiceUtils.getSharedPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this); mPrefs.registerOnSharedPreferenceChangeListener(this);
setLocale(); setLocale();
@ -490,7 +491,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
private void enableHiddenServicePort (int hsPort) private void enableHiddenServicePort (int hsPort)
{ {
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
Editor pEdit = mPrefs.edit(); Editor pEdit = mPrefs.edit();
@ -609,7 +609,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here
showAlert("Bridges Updated","Restart Orbot to use this bridge: " + newBridgeValue,false); showAlert("Bridges Updated","Restart Orbot to use this bridge: " + newBridgeValue,false);
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
String bridges = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null); String bridges = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null);
@ -635,15 +634,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
else else
{ {
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
showWizard = mPrefs.getBoolean("show_wizard",showWizard); showWizard = mPrefs.getBoolean("show_wizard",showWizard);
if (showWizard) if (showWizard)
{ {
Editor pEdit = mPrefs.edit(); Editor pEdit = mPrefs.edit();
pEdit.putBoolean("show_wizard",false); pEdit.putBoolean("show_wizard",false);
pEdit.commit(); pEdit.commit();
showWizard = false; showWizard = false;
startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); startActivity(new Intent(this, ChooseLocaleWizardActivity.class));
@ -683,7 +680,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
*/ */
private void openBrowser(final String browserLaunchUrl) private void openBrowser(final String browserLaunchUrl)
{ {
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
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);
@ -904,7 +900,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
appendLogTextAndScroll(mTorServiceMsg); appendLogTextAndScroll(mTorServiceMsg);
} }
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true);
if (showFirstTime) if (showFirstTime)
@ -1282,7 +1277,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
Configuration config = getResources().getConfiguration(); Configuration config = getResources().getConfiguration();
SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
String lang = mPrefs.getString(PREF_DEFAULT_LOCALE, ""); String lang = mPrefs.getString(PREF_DEFAULT_LOCALE, "");
if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang)) if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang))