Remove old beast mode migration code

astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java

@@ -9,7 +9,6 @@ import android.app.ListActivity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
@@ -38,48 +37,8 @@ public class BeastModePreferences extends ListActivity {
 
     public static final String BEAST_MODE_PREF_ITEM_SEPARATOR = ";"; //$NON-NLS-1$
 
-    private static final String BEAST_MODE_ASSERTED_HIDE_ALWAYS = "asserted_hide_always"; //$NON-NLS-1$
-
     private HashMap<String, String> prefsToDescriptions;
 
-    /**
-     * Migration for existing users to assert that the "hide always" section divider exists in the preferences.
-     * Knowing that this section will always be in the constructed list of controls simplifies the logic a bit.
-     */
-    public static void assertHideUntilSectionExists(Context c, long latestSetVersion) {
-        if (latestSetVersion == 0) {
-            Preferences.setBoolean(BEAST_MODE_ASSERTED_HIDE_ALWAYS, true);
-        }
-
-        if (Preferences.getBoolean(BEAST_MODE_ASSERTED_HIDE_ALWAYS, false)) {
-            return;
-        }
-
-        String order = Preferences.getStringValue(BEAST_MODE_ORDER_PREF);
-        String hideSectionPref = c.getString(R.string.TEA_ctrl_hide_section_pref);
-        if (TextUtils.isEmpty(order)) {
-            // create preference and stick hide always at the end of it
-            String[] items = c.getResources().getStringArray(R.array.TEA_control_sets_prefs);
-            StringBuilder builder = new StringBuilder();
-            for (String item : items) {
-                if (item.equals(hideSectionPref)) {
-                    continue;
-                }
-                builder.append(item);
-                builder.append(BEAST_MODE_PREF_ITEM_SEPARATOR);
-            }
-
-            builder.append(hideSectionPref);
-            builder.append(BEAST_MODE_PREF_ITEM_SEPARATOR);
-            order = builder.toString();
-        } else if (!order.contains(hideSectionPref)) {
-            order += (hideSectionPref + BEAST_MODE_PREF_ITEM_SEPARATOR);
-        }
-        Preferences.setString(BEAST_MODE_ORDER_PREF, order);
-
-        Preferences.setBoolean(BEAST_MODE_ASSERTED_HIDE_ALWAYS, true);
-    }
-
     public static void setDefaultOrder(Context context) {
         if (Preferences.getStringValue(BEAST_MODE_ORDER_PREF) != null) {
             return;

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

@@ -29,7 +29,6 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.backup.BackupConstants;
 import com.todoroo.astrid.backup.BackupService;
 import com.todoroo.astrid.backup.TasksXmlImporter;
@@ -149,8 +148,6 @@ public class StartupService {
             }
         }
 
-        BeastModePreferences.assertHideUntilSectionExists(context, latestSetVersion);
-
         int version = 0;
         String versionName = "0"; //$NON-NLS-1$
         try {