Refactor to prevent audits from ViewOnlyFormHierarchyActivity

cooperka · Nov 19, 2018 · a6d1843 · a6d1843
1 parent 2c5a701
commit a6d1843
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 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
@@ -449,16 +449,18 @@ void onQuestionClicked(FormIndex index) {
      * level in the hierarchy as the "Go Up" button does.
      */
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                FormController fc = Collect.getInstance().getFormController();
-                if (fc != null) {
-                    fc.getTimerLogger().exitView();
-                    fc.jumpToIndex(startIndex);
-                }
+    public void onBackPressed() {
+        FormController formController = Collect.getInstance().getFormController();
+        if (formController != null) {
+            formController.getTimerLogger().exitView();
+            formController.jumpToIndex(startIndex);
         }
-        return super.onKeyDown(keyCode, event);
+
+        onBackPressedWithoutLogger();
+    }
+
+    protected void onBackPressedWithoutLogger() {
+        super.onBackPressed();
     }
 
     /**

diff --git a/...t_app/src/main/java/org/odk/collect/android/activities/ViewOnlyFormHierarchyActivity.java b/...t_app/src/main/java/org/odk/collect/android/activities/ViewOnlyFormHierarchyActivity.java
@@ -59,7 +59,7 @@ void onQuestionClicked(FormIndex index) {
      * Prevents logging an audit event when the user exits the activity.
      */
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return super.onKeyDown(keyCode, event);
+    public void onBackPressed() {
+        onBackPressedWithoutLogger();
     }
 }