Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 28 Wiki Activity

Removed unused code in PreferencesActivity

Browse Source
This commit is contained in:
Alejandro Alcalde 2014-08-09 10:14:13 +02:00
parent d3ab3556e6
commit 7d1871ca81
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
SWADroid/src/es/ugr/swad/swadroid/PreferencesActivity.java
View File

@ -158,13 +158,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
* User password preference changed flag
*/
private boolean userPasswordPrefChanged = false;
/**
* User password has errors
*/
private boolean mIncorrectPassword = false;
private static final String PASSWORD_VALIDATE = "passw_validate";
/**
* Shows an error message.
@ -378,14 +371,11 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
Log.i(TAG, "Forced logout due to " + key + " change in preferences");
userPasswordPrefChanged = true;
syncPrefsChanged = true;
mIncorrectPassword = false;
Preferences.setPreferencesChanged();
Constants.setLogged(false);
} else {
Toast.makeText(getApplicationContext(), R.string.pradoLoginToast,
Toast.LENGTH_LONG).show();
highlightPasswordSummary();
mIncorrectPassword = true;
// Do not save the password to the preferences.
returnValue = false;
}
@ -485,10 +475,7 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
if(userPasswordPrefChanged) {
Preferences.setUserPassword(userPassword);
}
if (mIncorrectPassword)
Constants.setLogged(false);
//Reconfigure automatic synchronization
if(syncPrefsChanged) {
SyncUtils.removePeriodicSync(Constants.AUTHORITY, Bundle.EMPTY, ctx);
@ -542,27 +529,4 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
syncTimePref.setSummary(prefSyncTimeEntry);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
if (mIncorrectPassword)
outState.putBoolean(PASSWORD_VALIDATE, mIncorrectPassword);
}
@Override
protected void onRestoreInstanceState(Bundle state) {
super.onRestoreInstanceState(state);
if (state.getBoolean(PASSWORD_VALIDATE)){
highlightPasswordSummary();
mIncorrectPassword = true;
}
}
private void highlightPasswordSummary(){
userPasswordPref.setLayoutResource(R.layout.preference_child_summary_error);
userPasswordPref.setSummary(mServer.equals("swad.ugr.es") ? R.string.error_password_summaryUGR : R.string.error_password_summary);
}
}