Handle process death during filling a form

collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java

@@ -716,6 +716,7 @@ private void nonblockingCreateSavePointData() {
         }
     }
 
+    // This method may return null if called before form loading is finished
     @Nullable
     private FormController getFormController() {
         return Collect.getInstance().getFormController();
@@ -2315,9 +2316,8 @@ public void denied() {
                 if (pendingActivityResult) {
                     Timber.w("Calling onActivityResult from loadingComplete");
 
-                    // set the current view to whatever group we were at...
+                    formControllerAvailable(formController);
                     onScreenRefresh();
-                    // process the pending activity request...
                     onActivityResult(task.getRequestCode(), task.getResultCode(), task.getIntent());
                     return;
                 }
@@ -2644,7 +2644,7 @@ private void displayUIFor(@Nullable BackgroundLocationManager.BackgroundLocation
 
     @Override
     public void widgetValueChanged(QuestionWidget changedWidget) {
-        FormController formController = Collect.getInstance().getFormController();
+        FormController formController = getFormController();
         if (formController == null) {
             // TODO: As usual, no idea if/how this is possible.
             return;
@@ -2687,15 +2687,15 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
      */
     private void updateFieldListQuestions(FormIndex lastChangedIndex) throws FormDesignException {
         // Save the user-visible state for all questions in this field-list
-        FormEntryPrompt[] questionsBeforeSave = Collect.getInstance().getFormController().getQuestionPrompts();
+        FormEntryPrompt[] questionsBeforeSave = getFormController().getQuestionPrompts();
         List<ImmutableDisplayableQuestion> immutableQuestionsBeforeSave = new ArrayList<>();
         for (FormEntryPrompt questionBeforeSave : questionsBeforeSave) {
             immutableQuestionsBeforeSave.add(new ImmutableDisplayableQuestion(questionBeforeSave));
         }
 
         saveAnswersForCurrentScreen(questionsBeforeSave, immutableQuestionsBeforeSave);
 
-        FormEntryPrompt[] questionsAfterSave = Collect.getInstance().getFormController().getQuestionPrompts();
+        FormEntryPrompt[] questionsAfterSave = getFormController().getQuestionPrompts();
 
         Map<FormIndex, FormEntryPrompt> questionsAfterSaveByIndex = new HashMap<>();
         for (FormEntryPrompt question : questionsAfterSave) {

collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryViewModel.java

@@ -13,16 +13,13 @@
 import org.javarosa.form.api.FormEntryController;
 import org.jetbrains.annotations.NotNull;
 import org.odk.collect.android.analytics.Analytics;
-import org.odk.collect.android.application.Collect;
 import org.odk.collect.android.exception.JavaRosaException;
 import org.odk.collect.android.formentry.audit.AuditEvent;
 import org.odk.collect.android.javarosawrapper.FormController;
 import org.odk.collect.utilities.Clock;
 
 import javax.inject.Inject;
 
-import timber.log.Timber;
-
 import static org.odk.collect.android.javarosawrapper.FormIndexUtils.getRepeatGroupIndex;
 
 public class FormEntryViewModel extends ViewModel implements RequiresFormController {
@@ -133,8 +130,6 @@ public boolean canAddRepeat() {
     }
 
     public void moveForward() {
-        ensureFormController();
-
         try {
             formController.stepToNextScreenEvent();
         } catch (JavaRosaException e) {
@@ -146,8 +141,6 @@ public void moveForward() {
     }
 
     public void moveBackward() {
-        ensureFormController();
-
         try {
             int event = formController.stepToPreviousScreenEvent();
 
@@ -164,7 +157,6 @@ public void moveBackward() {
     }
 
     public void openHierarchy() {
-        ensureFormController();
         formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.HIERARCHY, true, clock.getCurrentTime());
     }
 
@@ -180,13 +172,6 @@ private String getFormIdentifierHash() {
         }
     }
 
-    private void ensureFormController() {
-        if (this.formController == null) {
-            Timber.e(new IllegalStateException("ensureFormController called before formLoaded"));
-            this.formController = Collect.getInstance().getFormController();
-        }
-    }
-
     public static class Factory implements ViewModelProvider.Factory {
 
         private final Clock clock;

collect_app/src/main/java/org/odk/collect/android/javarosawrapper/FormController.java

@@ -183,7 +183,7 @@ public AuditEventLogger getAuditEventLogger() {
      */
     public String getXPath(FormIndex index) {
         String value;
-        switch (getEvent()) {
+        switch (getEvent(index)) {
             case FormEntryController.EVENT_BEGINNING_OF_FORM:
                 value = "beginningOfForm";
                 break;