Handle crashes reported from Android Market

api/src/com/todoroo/andlib/data/AbstractModel.java

@@ -184,15 +184,19 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
                 "Model Error: Did not read property " + property.name); //$NON-NLS-1$
 
         // resolve properties that were retrieved with a different type than accessed
-        if(value instanceof String && property instanceof LongProperty)
-            return (TYPE) Long.valueOf((String)value);
-        else if(value instanceof String && property instanceof IntegerProperty)
-            return (TYPE) Integer.valueOf((String)value);
-        else if(value instanceof String && property instanceof DoubleProperty)
-            return (TYPE) Double.valueOf((String)value);
-        else if(value instanceof Integer && property instanceof LongProperty)
-            return (TYPE) Long.valueOf(((Number)value).longValue());
-        return (TYPE) value;
+        try {
+            if(value instanceof String && property instanceof LongProperty)
+                return (TYPE) Long.valueOf((String)value);
+            else if(value instanceof String && property instanceof IntegerProperty)
+                return (TYPE) Integer.valueOf((String)value);
+            else if(value instanceof String && property instanceof DoubleProperty)
+                return (TYPE) Double.valueOf((String)value);
+            else if(value instanceof Integer && property instanceof LongProperty)
+                return (TYPE) Long.valueOf(((Number)value).longValue());
+            return (TYPE) value;
+        } catch (NumberFormatException e) {
+            return (TYPE) getDefaultValues().get(property.name);
+        }
     }
 
     /**

astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java

@@ -180,7 +180,7 @@ public class TouchListView extends ListView {
 			for (int i = 0;; i++) {
 					View v = getChildAt(i);
 					if (v == null) {
-							if (deletion) {
+							if (deletion && getCount() > 0) {
 									// HACK force update of mItemCount
 									int position = getFirstVisiblePosition();
 									int y = getChildAt(0).getTop();

astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java

@@ -371,10 +371,10 @@ public class EditPeopleControlSet implements TaskEditControlSet {
         saveToast = toast;
         boolean dirty = false;
         try {
-            JSONObject userJson;
+            JSONObject userJson = null;
             if(assignedCustom.getVisibility() == View.VISIBLE)
                 userJson = PeopleContainer.createUserJson(assignedCustom);
-            else
+            else if(assignedSpinner.getSelectedItem() != null)
                 userJson = ((AssignedToUser) assignedSpinner.getSelectedItem()).user;
 
             if(userJson == null || userJson.optLong("id", -1) == 0) {

astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java

@@ -73,7 +73,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
                 setting));
 
         // if user changed the value, refresh task defaults
-        if(!value.equals(Preferences.getStringValue(preference.getKey()))) {
+        if(!AndroidUtilities.equals(value, Preferences.getStringValue(preference.getKey()))) {
             Editor editor = Preferences.getPrefs(this).edit();
             editor.putString(preference.getKey(), (String)value);
             editor.commit();

astrid/src/com/todoroo/astrid/activity/FilterListActivity.java

@@ -86,7 +86,7 @@ public class FilterListActivity extends ExpandableListActivity {
     @Autowired ActFmPreferenceService actFmPreferenceService;
     @Autowired ActFmSyncService actFmSyncService;
 
-    FilterAdapter adapter = null;
+    protected FilterAdapter adapter = null;
 
     /* ======================================================================
      * ======================================================= initialization

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -146,6 +146,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
     public void clear() {
         items.clear();
+        notifyDataSetInvalidated();
     }
 
     /**