From cefc122acbbadda8a5c919bb6cc49ef6407303ff Mon Sep 17 00:00:00 2001 From: lognaturel Date: Mon, 5 Nov 2018 09:36:08 -0800 Subject: [PATCH] Use existing FormController variable which can't be null --- .../activities/FormHierarchyActivity.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 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 index a3481bf4afb..4eb79b6a186 100644 --- 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(); }