Cleaned up with Tim's suggestions

api/src/com/todoroo/andlib/sql/Join.java

@@ -33,14 +33,16 @@ public class Join {
     }
 
     @Override
+    @SuppressWarnings("nls")
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(joinType).append(SPACE).append(JOIN).append(SPACE).append(joinTable).append(SPACE).append(ON);
+        sb.append(joinType).append(SPACE).append(JOIN).append(SPACE).append(joinTable).append(SPACE).append(ON).append(SPACE).append("(");
         for (int i = 0; i < criterions.length; i++) {
-            sb.append(SPACE).append(criterions[i]);
+            sb.append(criterions[i]);
             if (i < criterions.length - 1)
                 sb.append(SPACE).append(AND);
         }
+        sb.append(")");
         return sb.toString();
     }
 }

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

@@ -1169,8 +1169,7 @@ public final class ActFmSyncService {
             try {
                 if (match.getCount() > 0) {
                     match.moveToFirst();
-                    Task matchedTitle = new Task(match);
-                    remote.setId(matchedTitle.getId());
+                    remote.setId(match.get(Task.ID));
                 }
             } finally {
                 match.close();

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java

@@ -334,8 +334,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         try {
             if (match.getCount() > 0) {
                 match.moveToFirst();
-                Task matchedTask = new Task(match);
-                task.setId(matchedTask.getId());
+                task.setId(match.get(Task.ID));
             }
         } finally {
             match.close();

astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java

@@ -227,36 +227,6 @@ public class SyncActionHelper {
             showSyncOptionMenu(actions, listener);
 
         } else {
-            // We have sync actions, pop up a dialogue so the user can
-            // select just one of them (only sync one at a time)
-//            final Object[] actions = new Object[activeSyncs];
-//
-//            int i;
-//            for (i = 0; i < activeV2Providers.size(); i++)
-//                actions[i] = activeV2Providers.get(i);
-//            for (SyncAction syncAction : syncActions)
-//                actions[i++] = syncAction;
-//
-//            DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-//                @Override
-//                public void onClick(DialogInterface click, int which) {
-//                    if (actions[which] instanceof SyncAction) {
-//                        try {
-//                            ((SyncAction) actions[which]).intent.send();
-//                            Toast.makeText(activity,
-//                                    R.string.SyP_progress_toast,
-//                                    Toast.LENGTH_LONG).show();
-//                        } catch (CanceledException e) {
-//                            //
-//                        }
-//                    } else {
-//                        ((SyncV2Provider) actions[which]).synchronizeActiveTasks(
-//                                true, syncResultCallback);
-//                    }
-//                }
-//            };
-//            showSyncOptionMenu(actions, listener);
-
             syncService.synchronizeActiveTasks(true, syncResultCallback);
         }
     }