Remove audit setting (getodk#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.
zestyping · Jun 26, 2017 · 8c17ed9 · 8c17ed9
1 parent 23ae784
commit 8c17ed9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>