am 75d60f04: Merge "Null check mCheckFrequency before using" into ub-mail-algol
* commit '75d60f045b8344f7a894e895c1bd95957f5e24bf': Null check mCheckFrequency before using
This commit is contained in:
commit
131baa26a1
|
@ -212,15 +212,21 @@ public class AccountSettingsFragment extends PreferenceFragment
|
||||||
final CharSequence [] syncIntervals =
|
final CharSequence [] syncIntervals =
|
||||||
savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVALS);
|
savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVALS);
|
||||||
mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
|
mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
|
||||||
mCheckFrequency.setEntries(syncIntervalStrings);
|
if (mCheckFrequency != null) {
|
||||||
mCheckFrequency.setEntryValues(syncIntervals);
|
mCheckFrequency.setEntries(syncIntervalStrings);
|
||||||
|
mCheckFrequency.setEntryValues(syncIntervals);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onSaveInstanceState(Bundle outstate) {
|
public void onSaveInstanceState(Bundle outstate) {
|
||||||
super.onSaveInstanceState(outstate);
|
super.onSaveInstanceState(outstate);
|
||||||
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS, mCheckFrequency.getEntries());
|
if (mCheckFrequency != null) {
|
||||||
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS, mCheckFrequency.getEntryValues());
|
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS,
|
||||||
|
mCheckFrequency.getEntries());
|
||||||
|
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS,
|
||||||
|
mCheckFrequency.getEntryValues());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue