Merge pull request #1341 from dimagi/copy_of_fcm_background_sync

Duplicate of fcm_background_sync
dimagi · Oct 3, 2023 · 8850102 · 8850102
2 parents ffd5e12 + 4734d6d
commit 8850102
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/main/java/org/commcare/session/SessionNavigationResponder.java b/src/main/java/org/commcare/session/SessionNavigationResponder.java
@@ -2,6 +2,8 @@
 
 import org.javarosa.core.model.condition.EvaluationContext;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * Interface defining all functionality to be implemented by any class that will receive and
  * process status codes from a SessionNavigator
@@ -19,4 +21,5 @@ public interface SessionNavigationResponder {
     // Provide a hook to the current evaluation context that the SessionNavigator will use
     EvaluationContext getEvalContextForNavigator();
 
+    ReentrantLock getBackgroundSyncLock();
 }
diff --git a/src/main/java/org/commcare/session/SessionNavigator.java b/src/main/java/org/commcare/session/SessionNavigator.java
@@ -28,6 +28,7 @@ public class SessionNavigator {
     public static final int START_SYNC_REQUEST = 7;
     public static final int PROCESS_QUERY_REQUEST = 8;
     public static final int REPORT_CASE_AUTOSELECT = 9;
+    public static final int FORM_ENTRY_ATTEMPT_DURING_SYNC = 10;
 
     private final SessionNavigationResponder responder;
     private CommCareSession currentSession;
@@ -107,6 +108,12 @@ private void readyToProceed() {
         else if (currentSession.getForm() == null) {
             sendResponse(NO_CURRENT_FORM);
         } else {
+            // The current state indicate that a form needs to be instantiated but a background sync is ongoing
+            if (responder.getBackgroundSyncLock().isLocked()) {
+                sendResponse(FORM_ENTRY_ATTEMPT_DURING_SYNC);
+                return;
+            }
+
             sendResponse(START_FORM_ENTRY);
         }
     }

diff --git a/src/test/java/org/commcare/test/utilities/MockSessionNavigationResponder.java b/src/test/java/org/commcare/test/utilities/MockSessionNavigationResponder.java
@@ -5,6 +5,8 @@
 import org.commcare.session.SessionNavigationResponder;
 import org.javarosa.core.model.condition.EvaluationContext;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * A mock implementer of the SessionNavigationResponder interface, for testing purposes
  *
@@ -14,9 +16,11 @@ public class MockSessionNavigationResponder implements SessionNavigationResponde
 
     private final SessionWrapper sessionWrapper;
     private int lastReceivedResultCode;
+    private ReentrantLock backgroungSyncLock;
 
     public MockSessionNavigationResponder(SessionWrapper sessionWrapper) {
         this.sessionWrapper = sessionWrapper;
+        this.backgroungSyncLock = new ReentrantLock();
     }
 
     public int getLastResultCode() {
@@ -38,4 +42,9 @@ public EvaluationContext getEvalContextForNavigator() {
         return sessionWrapper.getEvaluationContext();
     }
 
+    @Override
+    public ReentrantLock getBackgroundSyncLock() {
+        return backgroungSyncLock;
+    }
+
 }