PR fix: More accurately detect beginning of form

Previously would think it was at the beginning when it was at the first question inside of the first group.
rral0 · Jan 23, 2019 · 4b77e0a · 4b77e0a
1 parent 6b6fd8d
commit 4b77e0a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java
@@ -216,7 +216,8 @@ private void updateOptionsMenu() {
         }
 
         FormController formController = Collect.getInstance().getFormController();
-        boolean isAtBeginning = formController.isCurrentQuestionFirstInForm() && !shouldShowRepeatGroupPicker();
+        FormIndex currIndex = formController.getFormIndex();
+        boolean isAtBeginning = currIndex.isBeginningOfFormIndex() && !shouldShowRepeatGroupPicker();
         boolean shouldShowPicker = shouldShowRepeatGroupPicker();
         boolean isInRepeat = !isAtBeginning && formController.getEvent(screenIndex) == FormEntryController.EVENT_REPEAT;