From 8c17ed9a2b61a1d57e692056e6b433fd816302f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= <lognaturel@gmail.com>
Date: Mon, 26 Jun 2017 16:38:33 -0700
Subject: [PATCH] Remove audit setting (#1203)

* Make the default value for audit pref true.

This setting suppresses the form-level setting when false. The default should be true.

* Remove the audit setting from the user interface.

This leaves dead code pending a decision regarding the setting. If the setting is removed, some code will need to be cleaned up.
---
 .../odk/collect/android/utilities/TimerLogger.java    |  2 +-
 collect_app/src/main/res/values/strings.xml           |  3 ---
 .../src/main/res/xml/form_management_preferences.xml  | 11 -----------
 collect_app/src/main/res/xml/preferences.xml          | 11 -----------
 .../main/res/xml/user_settings_access_preferences.xml |  5 -----
 5 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/TimerLogger.java b/collect_app/src/main/java/org/odk/collect/android/utilities/TimerLogger.java
index ade4df42cbe..accf3982f02 100644
--- a/collect_app/src/main/java/org/odk/collect/android/utilities/TimerLogger.java
+++ b/collect_app/src/main/java/org/odk/collect/android/utilities/TimerLogger.java
@@ -172,7 +172,7 @@ public TimerLogger(File instanceFile, SharedPreferences sharedPreferences, FormC
          */
         boolean loggingEnabledInForm = formController.getSubmissionMetadata().audit;
         boolean loggingEnabledInPref = sharedPreferences.getBoolean(
-                AdminKeys.KEY_TIMER_LOG_ENABLED, false);
+                AdminKeys.KEY_TIMER_LOG_ENABLED, true);
         timerEnabled = loggingEnabledInForm && loggingEnabledInPref;
 
         if (timerEnabled) {
diff --git a/collect_app/src/main/res/values/strings.xml b/collect_app/src/main/res/values/strings.xml
index b73994e628b..79c537fb07c 100644
--- a/collect_app/src/main/res/values/strings.xml
+++ b/collect_app/src/main/res/values/strings.xml
@@ -507,9 +507,6 @@
     <string name="server_settings_title">Server</string>
     <string name="type">Type</string>
     <string name="form_entry">Uncheck to hide from Form Entry</string>
-    <string name="audit">Audit</string>
-    <string name="timer_log">Record time in questions</string>
-    <string name="timer_log_summary">Record time spent answering each question</string>
     <string name="use_device_language">Use device language</string>
     <string name="not_supported_offline_layer_format">Selected offline layer file uses the PBF format which is not supported!</string>
 </resources>
diff --git a/collect_app/src/main/res/xml/form_management_preferences.xml b/collect_app/src/main/res/xml/form_management_preferences.xml
index cd4a94c5d89..01f2fde9f9b 100644
--- a/collect_app/src/main/res/xml/form_management_preferences.xml
+++ b/collect_app/src/main/res/xml/form_management_preferences.xml
@@ -19,17 +19,6 @@
             android:title="@string/delete_after_send" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="@string/audit"
-        android:title="@string/audit" >
-        <CheckBoxPreference
-            android:id="@+id/timer_log"
-            android:defaultValue="true"
-            android:key="timer_log"
-            android:summary="@string/timer_log_summary"
-            android:title="@string/timer_log" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="form_filling"
         android:title="@string/form_filling_category">
diff --git a/collect_app/src/main/res/xml/preferences.xml b/collect_app/src/main/res/xml/preferences.xml
index 4ffc9cd0392..ab4a037a06c 100644
--- a/collect_app/src/main/res/xml/preferences.xml
+++ b/collect_app/src/main/res/xml/preferences.xml
@@ -88,17 +88,6 @@
                 android:title="@string/delete_after_send" />
         </PreferenceCategory>
 
-        <PreferenceCategory
-            android:key="@string/audit"
-            android:title="@string/audit" >
-            <CheckBoxPreference
-                android:id="@+id/timer_log"
-                android:defaultValue="true"
-                android:key="timer_log"
-                android:summary="@string/timer_log_summary"
-                android:title="@string/timer_log" />
-        </PreferenceCategory>
-
         <PreferenceCategory
             android:key="form_filling"
             android:title="@string/form_filling_category">
diff --git a/collect_app/src/main/res/xml/user_settings_access_preferences.xml b/collect_app/src/main/res/xml/user_settings_access_preferences.xml
index 8341c895058..1b3563afac7 100644
--- a/collect_app/src/main/res/xml/user_settings_access_preferences.xml
+++ b/collect_app/src/main/res/xml/user_settings_access_preferences.xml
@@ -76,10 +76,5 @@
             android:defaultValue="true"
             android:key="analytics"
             android:title="@string/analytics" />
-        <CheckBoxPreference
-            android:id="@+id/timer_log"
-            android:defaultValue="true"
-            android:key="change_timer_log"
-            android:title="@string/timer_log" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file