Set defaults on upgrade

src/main/java/com/todoroo/astrid/service/StartupService.java

@@ -134,6 +134,7 @@ public class StartupService {
                     putExtra(UpgradeActivity.TOKEN_FROM_VERSION, lastVersion);
                 }}, 0);
             }
+            preferences.setDefaults();
             preferences.setCurrentVersion(currentVersion);
         }
 
@@ -180,10 +181,6 @@ public class StartupService {
             }
         }).start();
 
-        if (!preferences.getBoolean(PreferenceManager.KEY_HAS_SET_DEFAULT_VALUES, false)) {
-            preferences.setDefaults();
-        }
-
         if (lastVersion == 0) {
             broadcaster.firstLaunch();
         }

src/main/java/org/tasks/preferences/Preferences.java

@@ -111,9 +111,13 @@ public class Preferences {
     }
 
     public void setDefaults() {
-        PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true);
         PreferenceManager.setDefaultValues(context, R.xml.preferences_appearance, true);
+        PreferenceManager.setDefaultValues(context, R.xml.preferences_backup, true);
+        PreferenceManager.setDefaultValues(context, R.xml.preferences_date_shortcuts, true);
+        PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true);
+        PreferenceManager.setDefaultValues(context, R.xml.preferences_gtasks, true);
         PreferenceManager.setDefaultValues(context, R.xml.preferences_misc, true);
+        PreferenceManager.setDefaultValues(context, R.xml.preferences_privacy, true);
         PreferenceManager.setDefaultValues(context, R.xml.preferences_reminders, true);
 
         BeastModePreferences.setDefaultOrder(this, context);

src/main/res/xml/preferences_blank.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_title">
-</PreferenceScreen>