diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-19 19:46:46 +0200 | 
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-19 19:46:46 +0200 | 
| commit | 8dda7b1df0a2f026cee69430b302ea9f452e442f (patch) | |
| tree | 9c967c86c7e634d9b5958bd7526426a3e0793545 /app/src/debug/java | |
| parent | 7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff) | |
| parent | c1d13ccd8f78601142a33273093e1b3cadaead58 (diff) | |
Merge branch 'hotfix/Upgrades-don't-rebuild-the-vpn-profile-if-necessary-#5999' into develop
Diffstat (limited to 'app/src/debug/java')
| -rw-r--r-- | app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java index cf013f3a..153cb731 100644 --- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java @@ -96,7 +96,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD      @Override
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
 -	    preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
 +	    preferences = preferences;
          setContentView(R.layout.configuration_wizard_activity);
  	    mProgressBar = (ProgressBar) findViewById(R.id.progressbar_configuration_wizard);
 @@ -230,7 +230,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD  		mProgressBar.setVisibility(ProgressBar.GONE);
  		mProgressBar.setProgress(0);
  		progressbar_description.setVisibility(TextView.GONE);
 -		getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().remove(Provider.KEY).commit();
 +		preferences.edit().remove(Provider.KEY).commit();
      	setting_up_provider = false;
  	showAllProviders();      }
 @@ -497,7 +497,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD  	}
  	private void autoSelectProvider(String provider_main_url, boolean danger_on) {
 -		getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(ProviderItem.DANGER_ON, danger_on).commit();
 +		preferences.edit().putBoolean(ProviderItem.DANGER_ON, danger_on).commit();
  		onItemSelected(getId(provider_main_url));
  	}
  | 
