ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sync window preference being added multiple times 

Also clean up potential NPE

b/13109860

Change-Id: I46bebd6af6329679af28b6b997cd33fca97376dd
This commit is contained in:
Tony Mantler 2014-02-26 16:02:12 -08:00
parent da2582c9f4
commit 9ef2c5f2cf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -591,9 +591,11 @@ public class AccountSettingsFragment extends PreferenceFragment
PreferenceCategory dataUsageCategory =
(PreferenceCategory) findPreference(PREFERENCE_CATEGORY_DATA_USAGE);
mSyncWindow = null;
if (info.offerLookback) {
mSyncWindow = new ListPreference(mContext);
if (mSyncWindow == null) {
mSyncWindow = new ListPreference(mContext);
dataUsageCategory.addPreference(mSyncWindow);
}
mSyncWindow.setTitle(R.string.account_setup_options_mail_window_label);
mSyncWindow.setValue(String.valueOf(mAccount.getSyncLookback()));
final int maxLookback;
@ -619,7 +621,6 @@ public class AccountSettingsFragment extends PreferenceFragment
return false;
}
});
dataUsageCategory.addPreference(mSyncWindow);
}
PreferenceCategory folderPrefs =
@ -734,7 +735,9 @@ public class AccountSettingsFragment extends PreferenceFragment
// Release the account
SecurityPolicy.setAccountHoldFlag(mContext, mAccount, false);
// Remove the preference
policiesCategory.removePreference(retryAccount);
if (policiesCategory != null) {
policiesCategory.removePreference(retryAccount);
}
return true;
}
});