Merge pull request #3633 from dimagi/ci-575-form-filling-crash

CI-575 - Solved form crash

Author: Jignesh-dimagi

app/src/org/commcare/activities/FormEntryActivity.java

@@ -146,6 +146,7 @@ public class FormEntryActivity extends SaveSessionCommCareActivity<FormEntryActi
     private SecretKeySpec symetricKey = null;
 
     public static AndroidFormController mFormController;
+    private static volatile boolean isFormEntryActive = false;
 
     private boolean mIncompleteEnabled = true;
     private boolean instanceIsReadOnly = false;
@@ -1027,6 +1028,7 @@ private void restorePriorStates() {
 
     private void loadForm() {
         mFormController = null;
+        isFormEntryActive = false;
         instanceState.setFormRecordPath(null);
         InterruptedFormState savedFormSession = null;
 
@@ -1131,6 +1133,7 @@ private void handleFormLoadCompletion(AndroidFormController fc) {
         }
 
         mFormController = fc;
+        isFormEntryActive = true;
         FirebaseAnalyticsUtil.reportFormEntry(getCurrentFormXmlnsFailSafe());
 
         // Newer menus may have already built the menu, before all data was ready
@@ -1253,7 +1256,7 @@ protected void onDestroy() {
         }
 
         if (!isChangingConfigurations()) {
-            mFormController = null;
+            isFormEntryActive = false;
         }
 
         TextToSpeechConverter.INSTANCE.shutDown();
@@ -1722,4 +1725,8 @@ public CommCareActivityUIController getUIController() {
     public SecretKeySpec getSymetricKey() {
         return symetricKey;
     }
+
+    public static boolean isFormEntryInProgress() {
+        return isFormEntryActive;
+    }
 }

app/src/org/commcare/utils/GlobalErrorUtil.java

@@ -13,7 +13,7 @@ public class GlobalErrorUtil {
     private static final int ERROR_EXPIRATION_HOURS = 24;
 
     public static boolean triggerGlobalError(GlobalErrors error) {
-        if (FormEntryActivity.mFormController != null) {
+        if (FormEntryActivity.isFormEntryInProgress()) {
             return false;
         }