Merge pull request #492 from fieldsight/491/bugfix-stuck-at-queued

clears project map; resets queue to complete (#491)
fieldsight · Nov 27, 2019 · 09cc88a · 09cc88a
2 parents 164f82d + efd5763
commit 09cc88a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightUserSession.java b/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightUserSession.java
@@ -299,6 +299,8 @@ public void onComplete() {
                         removeFormsAndInstances(context, deletedForms -> {
                             ServiceGenerator.clearInstance();
                             SyncRepository.instance = null;
+                            Collect.syncableMap = null;
+                            Collect.selectedProjectList = null;
                             logoutListener.logoutTaskSuccess();
                             logoutListener.taskComplete();
                         });

diff --git a/...app/src/main/java/org/fieldsight/naxa/forms/data/remote/FieldSightFormRemoteSourceV3.java b/...app/src/main/java/org/fieldsight/naxa/forms/data/remote/FieldSightFormRemoteSourceV3.java
@@ -78,12 +78,21 @@ public Observable<Pair<FieldsightFormDetailsv3, String>> getFormUsingProjectId(L
                 .doOnNext(new Consumer<ArrayList<FieldsightFormDetailsv3>>() {
                     @Override
                     public void accept(ArrayList<FieldsightFormDetailsv3> fieldSightFormDetails) {
+
                         String[] projectIds = new String[projects.size()];
                         for (int i = 0; i < projects.size(); i++) {
                             projectIds[i] = projects.get(i).getId();
                         }
 
-                        FieldSightFormsLocalSourcev3.getInstance().updateAll(fieldSightFormDetails, projectIds);
+                        if (fieldSightFormDetails.isEmpty()) {
+                            for (String projectId : projectIds) {
+                                SyncLocalSource3.getInstance().markAsCompleted(String.valueOf(projectId), 1);
+                            }
+                        } else {
+                            FieldSightFormsLocalSourcev3.getInstance().updateAll(fieldSightFormDetails, projectIds);
+                        }
+
+
                     }
                 })
                 .flatMap((Function<ArrayList<FieldsightFormDetailsv3>, ObservableSource<Pair<FieldsightFormDetailsv3, String>>>) fieldSightFormDetails -> {