All TLM entries created on migration should be synced, since we will need to get real UUIDs for them and/or create them at some point

pull/14/head
Sam Bosley 13 years ago
parent 8baa2ce54a
commit 7a655f04bb

@ -373,13 +373,11 @@ public class EditPeopleControlSet extends PopupControlSet {
private String getLongOrStringId(JSONObject obj, String defaultValue) { private String getLongOrStringId(JSONObject obj, String defaultValue) {
try { try {
long value = obj.getLong("id"); //$NON-NLS-1$ long value = obj.getLong("id"); //$NON-NLS-1$
System.err.println("RETURNING VALUE: " + value);
return Long.toString(value); return Long.toString(value);
} catch (JSONException e) { } catch (JSONException e) {
String value = obj.optString("id"); //$NON-NLS-1$ String value = obj.optString("id"); //$NON-NLS-1$
if (TextUtils.isEmpty(value)) if (TextUtils.isEmpty(value))
value = defaultValue; value = defaultValue;
System.err.println("RETURNING VALUE: " + value);
return value; return value;
} }
} }

@ -133,7 +133,6 @@ public class AstridNewSyncMigrator {
// -------------- // --------------
// Then ensure that every remote model has a remote id, by generating one using the uuid generator for all those without one // Then ensure that every remote model has a remote id, by generating one using the uuid generator for all those without one
// -------------- // --------------
final Set<Long> tagsThatNeedOrderingSync = new HashSet<Long>();
final Set<Long> tasksThatNeedTagSync = new HashSet<Long>(); final Set<Long> tasksThatNeedTagSync = new HashSet<Long>();
try { try {
Query tagsQuery = Query.select(TagData.ID, TagData.UUID, TagData.MODIFICATION_DATE).where(Criterion.or(TagData.UUID.eq(RemoteModel.NO_UUID), TagData.UUID.isNull())); Query tagsQuery = Query.select(TagData.ID, TagData.UUID, TagData.MODIFICATION_DATE).where(Criterion.or(TagData.UUID.eq(RemoteModel.NO_UUID), TagData.UUID.isNull()));
@ -150,10 +149,7 @@ public class AstridNewSyncMigrator {
} }
@Override @Override
public void afterSave(TagData instance, boolean createdOutstanding) { public void afterSave(TagData instance, boolean createdOutstanding) {/**/}
if (createdOutstanding)
tagsThatNeedOrderingSync.add(instance.getId());
}
}); });
Query tasksQuery = Query.select(Task.ID, Task.UUID, Task.RECURRENCE, Task.FLAGS, Task.MODIFICATION_DATE, Task.LAST_SYNC).where(Criterion.all); Query tasksQuery = Query.select(Task.ID, Task.UUID, Task.RECURRENCE, Task.FLAGS, Task.MODIFICATION_DATE, Task.LAST_SYNC).where(Criterion.all);
@ -350,8 +346,6 @@ public class AstridNewSyncMigrator {
tlm.setValue(TaskListMetadata.TASK_IDS, tagOrdering); tlm.setValue(TaskListMetadata.TASK_IDS, tagOrdering);
tlm.setValue(TaskListMetadata.TAG_UUID, td.getUuid()); tlm.setValue(TaskListMetadata.TAG_UUID, td.getUuid());
if (!tagsThatNeedOrderingSync.contains(td.getId()))
tlm.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
taskListMetadataDao.createNew(tlm); taskListMetadataDao.createNew(tlm);
} }
} finally { } finally {

Loading…
Cancel
Save