skip local unsynced tasks when updating from server

to allow for the local changes be uploaded to server,..and not reset
opensrp · Sep 3, 2021 · 0c7d444 · 0c7d444
1 parent 2dfd11d
commit 0c7d444
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=4.3.20-SNAPSHOT
+VERSION_NAME=4.3.21-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

diff --git a/opensrp-app/src/main/java/org/smartregister/SyncConfiguration.java b/opensrp-app/src/main/java/org/smartregister/SyncConfiguration.java
@@ -226,4 +226,14 @@ public List<Pair<String, String>> getGlobalSettingsQueryParams() {
     public boolean validateUserAssignments() {
         return true;
     }
+
+
+    /**
+     * Specifies whether to skip locally saved task marked as {@link org.smartregister.repository.BaseRepository#TYPE_Unsynced}
+     * when fetching tasks from the server, during sync
+     * @return {@link Boolean}
+     */
+    public boolean skipUnsyncedTasksOnFetchFromServer(){
+        return false;
+    }
 }
diff --git a/opensrp-app/src/main/java/org/smartregister/sync/helper/TaskServiceHelper.java b/opensrp-app/src/main/java/org/smartregister/sync/helper/TaskServiceHelper.java
@@ -164,6 +164,17 @@ private List<Task> batchFetchTasksFromServer(Set<String> planDefinitions, List<S
             if (tasks != null && tasks.size() > 0) {
                 for (Task task : tasks) {
                     try {
+                        boolean skipUnsynced = CoreLibrary.getInstance().getSyncConfiguration()
+                                .skipUnsyncedTasksOnFetchFromServer();
+
+                        if (skipUnsynced) {
+                            Task existingTask = taskRepository.getTaskByIdentifier(task.getIdentifier());
+                            if (existingTask != null
+                                    && (existingTask.getSyncStatus().equals(BaseRepository.TYPE_Unsynced)
+                                    || existingTask.getSyncStatus().equals(BaseRepository.TYPE_Created))) {
+                                continue;
+                            }
+                        }
                         task.setSyncStatus(BaseRepository.TYPE_Synced);
                         task.setLastModified(new DateTime());
                         taskRepository.addOrUpdate(task);