Catch SQLiteConstraint exception in actfmsyncservice. Need to spend more time figuring out why it's happening

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java

@@ -24,6 +24,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.content.ContentValues;
+import android.database.sqlite.SQLiteConstraintException;
 import android.graphics.Bitmap;
 import android.os.ConditionVariable;
 import android.text.TextUtils;
@@ -1151,12 +1152,17 @@ public final class ActFmSyncService {
                 if (remote.getValue(Task.USER_ID) != Task.USER_ID_SELF)
                     remote.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
 
-                // TODO: It seems like something about this title matching might be causing SQLiteConstraint exceptions. Think about it.
+                // TODO: It seems like something about this title matching might be causing
+                // SQLiteConstraint exceptions. Think about it. In the meantime, catch and merge
                 if (!remote.isSaved() && gtasksPreferenceService.isLoggedIn()) {
                     titleMatchOnGoogleTask(remote);
                 }
 
+                try {
                     taskService.save(remote);
+                } catch (SQLiteConstraintException e) {
+                    taskDao.handleSQLiteConstraintException(remote);
+                }
                 ids.add(remote.getId());
                 metadataService.synchronizeMetadata(remote.getId(), metadata, MetadataCriteria.withKey(TagService.KEY));
                 synchronizeAttachments(item, remote);

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

@@ -186,14 +186,7 @@ public class TaskDao extends DatabaseDao<Task> {
             } catch (SQLiteConstraintException e) {
                 if(e.getMessage().contains(Task.REMOTE_ID_PROPERTY_NAME)) {
                     // Tried to create task with remote id that already exists
-                    saveSuccessful = false;
+                    saveSuccessful = handleSQLiteConstraintException(task);
-                    TodorooCursor<Task> cursor = query(Query.select(Task.ID).where(
-                            Task.REMOTE_ID.eq(task.getValue(Task.REMOTE_ID))));
-                    if (cursor.getCount() > 0) {
-                        cursor.moveToFirst();
-                        task.setId(cursor.get(Task.ID));
-                        saveSuccessful = saveExisting(task);
-                    }
                 }
             }
         } else {
@@ -203,6 +196,17 @@ public class TaskDao extends DatabaseDao<Task> {
         return saveSuccessful;
     }
 
+    public boolean handleSQLiteConstraintException(Task task) {
+        TodorooCursor<Task> cursor = query(Query.select(Task.ID).where(
+                Task.REMOTE_ID.eq(task.getValue(Task.REMOTE_ID))));
+        if (cursor.getCount() > 0) {
+            cursor.moveToFirst();
+            task.setId(cursor.get(Task.ID));
+            return saveExisting(task);
+        }
+        return false;
+    }
+
     @Override
     public boolean createNew(Task item) {
         if(!item.containsValue(Task.CREATION_DATE))