|
|
|
@ -752,6 +752,7 @@ public final class ActFmSyncService {
|
|
|
|
if(manual) {
|
|
|
|
if(manual) {
|
|
|
|
Long[] localIds = ids.toArray(new Long[ids.size()]);
|
|
|
|
Long[] localIds = ids.toArray(new Long[ids.size()]);
|
|
|
|
taskService.deleteWhere(Criterion.and(TaskCriteria.activeAndVisible(),
|
|
|
|
taskService.deleteWhere(Criterion.and(TaskCriteria.activeAndVisible(),
|
|
|
|
|
|
|
|
Task.REMOTE_ID.isNotNull(),
|
|
|
|
Criterion.not(Task.ID.in(localIds))));
|
|
|
|
Criterion.not(Task.ID.in(localIds))));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -810,6 +811,7 @@ public final class ActFmSyncService {
|
|
|
|
taskService.deleteWhere(Criterion.and(
|
|
|
|
taskService.deleteWhere(Criterion.and(
|
|
|
|
TagService.memberOfTagData(tagData.getValue(TagData.REMOTE_ID)),
|
|
|
|
TagService.memberOfTagData(tagData.getValue(TagData.REMOTE_ID)),
|
|
|
|
TaskCriteria.activeAndVisible(),
|
|
|
|
TaskCriteria.activeAndVisible(),
|
|
|
|
|
|
|
|
Task.REMOTE_ID.isNotNull(),
|
|
|
|
Criterion.not(Task.ID.in(localIds))));
|
|
|
|
Criterion.not(Task.ID.in(localIds))));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1063,8 +1065,6 @@ public final class ActFmSyncService {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** Call sync method */
|
|
|
|
/** Call sync method */
|
|
|
|
private void invokeFetchList(final String model, final boolean manual, final SyncExceptionHandler handler,
|
|
|
|
private void invokeFetchList(final String model, final boolean manual, final SyncExceptionHandler handler,
|
|
|
|
final ListItemProcessor<?> processor, final Runnable done, final String lastSyncKey,
|
|
|
|
final ListItemProcessor<?> processor, final Runnable done, final String lastSyncKey,
|
|
|
|
|