Use existing FormController variable which can't be null

getodk · Nov 5, 2018 · cefc122 · cefc122
1 parent f22b49d
commit cefc122
Showing 1 changed file with 6 additions and 10 deletions.
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
@@ -103,11 +103,9 @@ public void onClick(View v) {
         jumpBeginningButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                FormController fc = Collect.getInstance().getFormController();
-                if (fc != null) {
-                    fc.getTimerLogger().exitView();
-                    fc.jumpToIndex(FormIndex.createBeginningOfFormIndex());
-                }
+                formController.getTimerLogger().exitView();
+                formController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
+
                 setResult(RESULT_OK);
                 finish();
             }
@@ -117,11 +115,9 @@ public void onClick(View v) {
         jumpEndButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                FormController fc = Collect.getInstance().getFormController();
-                if (fc != null) {
-                    fc.getTimerLogger().exitView();
-                    fc.jumpToIndex(FormIndex.createEndOfFormIndex());
-                }
+                formController.getTimerLogger().exitView();
+                formController.jumpToIndex(FormIndex.createEndOfFormIndex());
+
                 setResult(RESULT_OK);
                 finish();
             }