Refactor to prevent database locks

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

@@ -263,15 +263,17 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         try {
             result.set(op.makeChange());
             if(result.get()) {
-                if (recordOutstanding)
+                if (recordOutstanding && createOutstandingEntries(item.getId(), values)) // Create entries for setValues in outstanding table
-                    createOutstandingEntries(item.getId(), values); // Create entries for setValues in outstanding table
+                    database.getDatabase().setTransactionSuccessful();
-                onModelUpdated(item);
-                item.markSaved();
             }
         } finally {
             if (recordOutstanding) // commit transaction
                 database.getDatabase().endTransaction();
         }
+        if (result.get()) {
+            onModelUpdated(item);
+            item.markSaved();
+        }
         return result.get();
     }
 
@@ -346,7 +348,6 @@ public class DatabaseDao<TYPE extends AbstractModel> {
                 database.insert(outstandingTable.name, null, m.getSetValues());
             }
         }
-        database.getDatabase().setTransactionSuccessful();
         return true;
     }
 

astrid/src/com/todoroo/astrid/dao/MetadataDao.java

@@ -102,7 +102,6 @@ public class MetadataDao extends DatabaseDao<Metadata> {
         m.setValue(OutstandingEntry.COLUMN_STRING_PROPERTY, addedOrRemoved);
         m.setValue(OutstandingEntry.VALUE_STRING_PROPERTY, tagUuid);
         database.insert(outstandingTable.name, null, m.getSetValues());
-        database.getDatabase().setTransactionSuccessful();
         return true;
     }