commit b0ca8b90aa8c1cf00f81e079834de97f606bc540
author Tony Mantler <nicoya@google.com> Thu Sep 18 11:06:50 2014 -0700
committer Tony Mantler <nicoya@google.com> Thu Sep 18 11:06:50 2014 -0700
tree 93a23d0d8eeba164db04b91678f2de607518acd3
parent ca87392454b642a9f3df68f7ccb56da3ea70fe45

Synchronize MailPrefs getter and match default values

b/17409439

Change-Id: I8d92c9314d85a833c0ebc067a6beb73fa1aa750e

res/xml/general_preferences.xml

diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index cb728d6..49e6b0d 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -71,17 +71,17 @@
             android:title="@string/preference_header_action_confirmations"
             android:key="removal-actions-group">
         <CheckBoxPreference
-                android:defaultValue="true"
+                android:defaultValue="false"
                 android:key="confirm-delete"
                 android:persistent="true"
                 android:title="@string/preference_confirm_before_delete_title" />
         <CheckBoxPreference
-                android:defaultValue="true"
+                android:defaultValue="false"
                 android:key="confirm-archive"
                 android:persistent="true"
                 android:title="@string/preference_confirm_before_archive_title" />
         <CheckBoxPreference
-                android:defaultValue="true"
+                android:defaultValue="false"
                 android:key="confirm-send"
                 android:persistent="true"
                 android:title="@string/preference_confirm_before_send_title" />

src/com/android/mail/preferences/MailPrefs.java

diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index 01a58ce..ae9fcfe 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java
@@ -120,7 +120,8 @@
 
         public static final String RECENT_ACCOUNTS = "recent-accounts";
 
-        public static final String REQUIRED_SANITIZER_VERSION_NUMBER = "required-sanitizer-version-number";
+        public static final String REQUIRED_SANITIZER_VERSION_NUMBER =
+                "required-sanitizer-version-number";
 
         public static final String MIGRATION_STATE = "migration-state";
 
@@ -169,7 +170,7 @@
         public static final String ARCHIVE_AND_DELETE = "archive-and-delete";
     }
 
-    public static MailPrefs get(final Context c) {
+    public static synchronized MailPrefs get(final Context c) {
         if (sInstance == null) {
             sInstance = new MailPrefs(c, PREFS_NAME);
         }