From 0ab32b9d582139893ae776a2f45b681717fdb06f Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 15 Nov 2012 10:43:36 -0800
Subject: [PATCH] Introduce an ErrorCatchingListView to fix a pre-ICS ListView
 bug (see
 http://stackoverflow.com/questions/12473625/nullpointerexception-at-android-widget-abslistview-contentfitsabslistview-java)

---
 .../astrid/taskrabbit/TaskRabbitActivity.java |  3 +-
 .../res/layout-land/filter_list_activity.xml  |  2 +-
 .../filter_list_fragment_alternative.xml      |  2 +-
 astrid/res/layout/addon_list_container.xml    |  2 +-
 astrid/res/layout/control_set_assigned.xml    |  2 +-
 astrid/res/layout/control_set_tags.xml        |  2 +-
 astrid/res/layout/custom_filter_activity.xml  |  2 +-
 astrid/res/layout/filter_list_activity.xml    |  2 +-
 .../res/layout/filter_list_activity_3pane.xml |  2 +-
 .../filter_list_fragment_alternative.xml      |  2 +-
 ...filter_list_fragment_alternative_3pane.xml |  2 +-
 astrid/res/layout/gtasks_login_activity.xml   |  2 +-
 astrid/res/layout/locale_edit_alerts.xml      |  2 +-
 astrid/res/layout/tag_updates_fragment.xml    |  2 +-
 astrid/res/layout/task_list_body_standard.xml |  2 +-
 astrid/res/layout/widget_config_activity.xml  |  2 +-
 .../astrid/ui/ErrorCatchingListView.java      | 31 +++++++++++++++++++
 17 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java

diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
index 146ab2e4e..b36d9fc76 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
@@ -69,6 +69,7 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.taskrabbit.TaskRabbitLocationManager.LocationResult;
+import com.todoroo.astrid.ui.ErrorCatchingListView;
 import com.todoroo.astrid.ui.FragmentPopover;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
 
@@ -897,7 +898,7 @@ public class TaskRabbitActivity extends FragmentActivity {
         String[] keys = getResources().getStringArray(R.array.tr_preset_types);
         if (adapter == null) {
             adapter = new ArrayAdapter<String>(this, R.layout.task_rabbit_menu_row, keys);
-            menuList = new ListView(this);
+            menuList = new ErrorCatchingListView(this);
             menuList.setAdapter(adapter);
             menuList.setCacheColorHint(Color.TRANSPARENT);
 
diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml
index dabb3e765..86ceb9f48 100644
--- a/astrid/res/layout-land/filter_list_activity.xml
+++ b/astrid/res/layout-land/filter_list_activity.xml
@@ -12,7 +12,7 @@
 
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="180dip"
         android:layout_alignParentTop="true"
diff --git a/astrid/res/layout-land/filter_list_fragment_alternative.xml b/astrid/res/layout-land/filter_list_fragment_alternative.xml
index 8c7491d4d..48484d219 100644
--- a/astrid/res/layout-land/filter_list_fragment_alternative.xml
+++ b/astrid/res/layout-land/filter_list_fragment_alternative.xml
@@ -12,7 +12,7 @@
 
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="230dip"
         android:layout_alignParentTop="true"
diff --git a/astrid/res/layout/addon_list_container.xml b/astrid/res/layout/addon_list_container.xml
index 40f877dfc..2f12254bc 100644
--- a/astrid/res/layout/addon_list_container.xml
+++ b/astrid/res/layout/addon_list_container.xml
@@ -18,7 +18,7 @@
         android:text="@string/AOA_no_addons"
         style="@style/TextAppearance.TLA_NoItems" />
   
-    <ListView android:id="@+id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@+id/list"
         android:paddingRight="8dip"
         android:orientation="vertical"
         android:layout_width="fill_parent"
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
index 516d37844..d098a7184 100644
--- a/astrid/res/layout/control_set_assigned.xml
+++ b/astrid/res/layout/control_set_assigned.xml
@@ -45,7 +45,7 @@
           android:gravity="center_vertical" />
     </LinearLayout>
     
-	<ListView
+	<com.todoroo.astrid.ui.ErrorCatchingListView
 	    android:id="@+id/assigned_list"
 	    android:layout_width="fill_parent"
 	    android:layout_height="fill_parent"
diff --git a/astrid/res/layout/control_set_tags.xml b/astrid/res/layout/control_set_tags.xml
index 8e686deff..30cc5c873 100644
--- a/astrid/res/layout/control_set_tags.xml
+++ b/astrid/res/layout/control_set_tags.xml
@@ -25,7 +25,7 @@
       android:layout_height="1px"
       android:padding="5dip"
       android:background="@android:drawable/divider_horizontal_dark"/>  
-  <ListView
+  <com.todoroo.astrid.ui.ErrorCatchingListView
       android:id="@+id/existingTags"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
diff --git a/astrid/res/layout/custom_filter_activity.xml b/astrid/res/layout/custom_filter_activity.xml
index 93b4c5a23..d6f454189 100644
--- a/astrid/res/layout/custom_filter_activity.xml
+++ b/astrid/res/layout/custom_filter_activity.xml
@@ -20,7 +20,7 @@
         android:capitalize="sentences" />
     
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100"
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 8e843cd29..5a2502c63 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -12,7 +12,7 @@
 
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="320dip"
         android:layout_alignParentTop="true"
diff --git a/astrid/res/layout/filter_list_activity_3pane.xml b/astrid/res/layout/filter_list_activity_3pane.xml
index df2e7191f..b74191658 100644
--- a/astrid/res/layout/filter_list_activity_3pane.xml
+++ b/astrid/res/layout/filter_list_activity_3pane.xml
@@ -35,7 +35,7 @@
     </LinearLayout>
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100"
diff --git a/astrid/res/layout/filter_list_fragment_alternative.xml b/astrid/res/layout/filter_list_fragment_alternative.xml
index f3609e5a7..f39462f2b 100644
--- a/astrid/res/layout/filter_list_fragment_alternative.xml
+++ b/astrid/res/layout/filter_list_fragment_alternative.xml
@@ -12,7 +12,7 @@
 
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="370dip"
         android:layout_alignParentTop="true"
diff --git a/astrid/res/layout/filter_list_fragment_alternative_3pane.xml b/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
index 02fe27838..7b64e7178 100644
--- a/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
+++ b/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
@@ -12,7 +12,7 @@
 
 
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_alignParentTop="true"
diff --git a/astrid/res/layout/gtasks_login_activity.xml b/astrid/res/layout/gtasks_login_activity.xml
index 6be5f3369..18ce3d51c 100644
--- a/astrid/res/layout/gtasks_login_activity.xml
+++ b/astrid/res/layout/gtasks_login_activity.xml
@@ -9,7 +9,7 @@
     android:layout_height="fill_parent"
     style="@style/Content">
 
-  <ListView android:id="@android:id/list"
+  <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"/>
         
diff --git a/astrid/res/layout/locale_edit_alerts.xml b/astrid/res/layout/locale_edit_alerts.xml
index 98395e815..a7a328c2e 100644
--- a/astrid/res/layout/locale_edit_alerts.xml
+++ b/astrid/res/layout/locale_edit_alerts.xml
@@ -34,7 +34,7 @@
                 android:layout_margin="10px"
                 android:background="@drawable/locale_border">
     
-                <ListView android:id="@android:id/list"
+                <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:scrollbars="vertical"
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index eb5324109..beece8b78 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -38,7 +38,7 @@
             style="@style/TextAppearance" />
     </LinearLayout>
 
-    <ListView
+    <com.todoroo.astrid.ui.ErrorCatchingListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/astrid/res/layout/task_list_body_standard.xml b/astrid/res/layout/task_list_body_standard.xml
index 6c0deab09..b6d5b4614 100644
--- a/astrid/res/layout/task_list_body_standard.xml
+++ b/astrid/res/layout/task_list_body_standard.xml
@@ -22,7 +22,7 @@
 	    style="@style/TextAppearance.TLA_NoItems"/>
     
     <!-- Task List -->
-    <ListView android:id="@android:id/list"           
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"           
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         style="@style/ListView" />
diff --git a/astrid/res/layout/widget_config_activity.xml b/astrid/res/layout/widget_config_activity.xml
index 8c7c457f6..77c83808c 100644
--- a/astrid/res/layout/widget_config_activity.xml
+++ b/astrid/res/layout/widget_config_activity.xml
@@ -17,7 +17,7 @@
         style="TextAppearance.ActionBar_ListsHeader" />
         
     <!-- List -->
-    <ListView android:id="@android:id/list"
+    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100"
diff --git a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java b/astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java
new file mode 100644
index 000000000..acb2bda11
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java
@@ -0,0 +1,31 @@
+package com.todoroo.astrid.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.ListView;
+
+public class ErrorCatchingListView extends ListView {
+
+    public ErrorCatchingListView(Context context) {
+        super(context);
+    }
+
+    public ErrorCatchingListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ErrorCatchingListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            return super.onTouchEvent(ev);
+        } catch (Exception e) {
+            return true;
+        }
+    }
+
+}