From 9ef2c5f2cfd4d06b3c2a0652f245b3cb2afcb23d Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Wed, 26 Feb 2014 16:02:12 -0800
Subject: [PATCH] Fix sync window preference being added multiple times

Also clean up potential NPE

b/13109860

Change-Id: I46bebd6af6329679af28b6b997cd33fca97376dd
---
 .../email/activity/setup/AccountSettingsFragment.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 802844b99..4aaae1c8a 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -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;
                         }
                     });