Closing a cursor from task provider, abstract database catch error

astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java

@@ -9,7 +9,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.util.Log;
@@ -112,15 +111,15 @@ abstract public class AbstractDatabase {
 
         try {
             database = helper.getWritableDatabase();
-        } catch (SQLiteException writeException) {
+        } catch (final RuntimeException original) {
             Log.e("database-" + getName(), "Error opening db",
-                    writeException);
+                    original);
             try {
                 // provide read-only database
                 openForReading();
-            } catch (SQLiteException readException) {
+            } catch (Exception readException) {
                 // throw original write exception
-                throw writeException;
+                throw original;
             }
         }
     }

astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java

@@ -175,33 +175,35 @@ public class Astrid2TaskProvider extends ContentProvider {
 		TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID, Task.TITLE,
 		        Task.IMPORTANCE, Task.DUE_DATE).where(TaskCriteria.isActive()).
 		        orderBy(TaskService.defaultTaskOrder()).limit(MAX_NUMBER_OF_TASKS));
-
-		int[] importanceColors = Task.getImportanceColors(ctx.getResources());
-
-		Task task = new Task();
-		for (int i = 0; i < cursor.getCount(); i++) {
-			cursor.moveToNext();
-			task.readFromCursor(cursor);
-
-			StringBuilder taskTags = new StringBuilder();
-			TodorooCursor<Metadata> tagCursor = TagService.getInstance().getTags(task.getId());
-			try {
-			    for(tagCursor.moveToFirst(); !tagCursor.isAfterLast(); tagCursor.moveToNext())
-			        taskTags.append(tagCursor.get(TagService.TAG)).append(TAG_SEPARATOR);
-			} finally {
-			    tagCursor.close();
-			}
-
-			Object[] values = new Object[7];
-			values[0] = task.getValue(Task.TITLE);
-			values[1] = importanceColors[task.getValue(Task.IMPORTANCE)];
-			values[2] = task.getValue(Task.DUE_DATE);
-			values[3] = task.getValue(Task.DUE_DATE);
-			values[4] = task.getValue(Task.IMPORTANCE);
-			values[5] = task.getId();
-			values[6] = taskTags.toString();
-
-			ret.addRow(values);
+		try {
+    		int[] importanceColors = Task.getImportanceColors(ctx.getResources());
+    		Task task = new Task();
+    		for (int i = 0; i < cursor.getCount(); i++) {
+    			cursor.moveToNext();
+    			task.readFromCursor(cursor);
+
+    			StringBuilder taskTags = new StringBuilder();
+    			TodorooCursor<Metadata> tagCursor = TagService.getInstance().getTags(task.getId());
+    			try {
+    			    for(tagCursor.moveToFirst(); !tagCursor.isAfterLast(); tagCursor.moveToNext())
+    			        taskTags.append(tagCursor.get(TagService.TAG)).append(TAG_SEPARATOR);
+    			} finally {
+    			    tagCursor.close();
+    			}
+
+    			Object[] values = new Object[7];
+    			values[0] = task.getValue(Task.TITLE);
+    			values[1] = importanceColors[task.getValue(Task.IMPORTANCE)];
+    			values[2] = task.getValue(Task.DUE_DATE);
+    			values[3] = task.getValue(Task.DUE_DATE);
+    			values[4] = task.getValue(Task.IMPORTANCE);
+    			values[5] = task.getId();
+    			values[6] = taskTags.toString();
+
+    			ret.addRow(values);
+    		}
+		} finally {
+		    cursor.close();
 		}
 
 		return ret;