From 32d446f59543e1cc2b51f70c0b8f397ff82387bf Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Wed, 4 Dec 2013 21:10:28 -0500
Subject: [PATCH] Fixed crash on preferences due to ListPreference entryValues
 being integer-array when it should have been string-array.

---
 Open-ILS/src/Android/res/values/resources.xml      | 34 ++++++++--------
 Open-ILS/src/Android/res/values/strings.xml        | 12 +++---
 .../res/xml/application_preference_screen.xml      | 45 ++++++++--------------
 3 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/Open-ILS/src/Android/res/values/resources.xml b/Open-ILS/src/Android/res/values/resources.xml
index 5ddde7c9aa..2912dc1d74 100644
--- a/Open-ILS/src/Android/res/values/resources.xml
+++ b/Open-ILS/src/Android/res/values/resources.xml
@@ -14,25 +14,23 @@
 		<item>Matches exactly</item>
     </string-array>
     
-    <integer-array name="notification_preferences_list_values">
-        <item >1</item>
-        <item >2</item>
-        <item >3</item>
-        <item >4</item>
-        <item >5</item>
-        <item >6</item>
-        <item >7</item>
-    </integer-array>
+    <string-array name="notification_preferences_list_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
     
     <string-array name="notification_preferences_list_entries">
-        <item >1 Day</item>
-        <item >2 Days</item>
-        <item >3 Days</item>
-        <item >4 Days</item>
-        <item >5 Days</item>
-        <item >6 Days</item>
-        <item >7 Days</item>
+        <item>1 Day</item>
+        <item>2 Days</item>
+        <item>3 Days</item>
+        <item>4 Days</item>
+        <item>5 Days</item>
+        <item>6 Days</item>
+        <item>7 Days</item>
     </string-array>
-
-    <integer name="notification_preferences_list_default_value">2</integer>
 </resources>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index bba9a7089e..3925ea56ba 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -131,17 +131,15 @@
     <string name="preference_password_summary">Enter your account password</string>
     <string name="preference_server_information_title">Server settings</string>
     <string name="preference_server_information_summary">Library server settings</string>
-    <string name="preference_library_url_address">Library url address</string>
-    <string name="preference_library_url_address_summary">Please enter the library url in format http://</string>
+    <string name="preference_library_url_address">Library URL</string>
+    <string name="preference_library_url_address_summary">Please enter the URL in format http://</string>
     <string name="preference_notification_preference_screen_title">Notification settings</string>
     <string name="preference_notification_preference_screen_summary">Configure notifications and reminders for checkout items</string>
     <string name="preference_enable_notifications">Enable notifications</string>
-    <string name="preference_enable_notifications_summary_on">Uncheck this option to remove notifications when checkout items are about to expire</string>
-    <string name="preference_enable_notifications_summary_off">Check this option to enable notifications each time a checkout item will expire</string>
+    <string name="preference_enable_notifications_summary_on">Uncheck this option to disable notifications when items are due</string>
+    <string name="preference_enable_notifications_summary_off">Check this option to enable notifications when items are due</string>
     <string name="preference_notifications_days_before">Days before expiration</string>
-    <string name="preference_notifications_days_before_summary">Chose how many days before the actual expiration date to set the reminder</string>
-    <string name="preference_notifications_each_day">Each day notifications</string>
-    <string name="preference_notifications_each_day_summary">Give a notification in every day before the actual start notification period and due date</string>
+    <string name="preference_notifications_days_before_summary">Chose how many days before the due date to start reminding</string>
     <string name="preference_notifications_title">Notification settings</string>
 
     <plurals name="number_of_copies">
diff --git a/Open-ILS/src/Android/res/xml/application_preference_screen.xml b/Open-ILS/src/Android/res/xml/application_preference_screen.xml
index 8647a96114..da3f473deb 100644
--- a/Open-ILS/src/Android/res/xml/application_preference_screen.xml
+++ b/Open-ILS/src/Android/res/xml/application_preference_screen.xml
@@ -13,33 +13,20 @@
   
 	<PreferenceCategory
 	   android:title="@string/preference_notifications_title" >
-	 	 
-	  <PreferenceScreen
-                android:key="NotificationsPrefScreen"
-                android:title="@string/preference_notification_preference_screen_title"
-                android:summary="@string/preference_notification_preference_screen_summary">
-				
-				<CheckBoxPreference 
-				    android:title="@string/preference_enable_notifications"
-				    android:key="notifications_enabled"
-				    android:summaryOn="@string/preference_enable_notifications_summary_on"
-				    android:summaryOff="@string/preference_enable_notifications_summary_off"
-				    />	
-	      
-				<ListPreference
-				    android:title="@string/preference_notifications_days_before"
-				    android:key="notifications_days_before_expiration"
-				    android:summary="@string/preference_notifications_days_before_summary"
-				    android:entries="@array/notification_preferences_list_entries"
-				    android:entryValues="@array/notification_preferences_list_values"
-				    android:defaultValue="@integer/notification_preferences_list_default_value"
-				    />
-				
-				<CheckBoxPreference 
-				    android:title="@string/preference_notifications_each_day"
-				    android:key="notifications_each_day_before_expiration"
-				    android:summary="@string/preference_notifications_each_day_summary"
-				    />
-        </PreferenceScreen>
-        </PreferenceCategory>
+        <CheckBoxPreference
+            android:title="@string/preference_enable_notifications"
+            android:key="notifications_enabled"
+            android:summaryOn="@string/preference_enable_notifications_summary_on"
+            android:summaryOff="@string/preference_enable_notifications_summary_off"
+            />
+
+        <ListPreference
+            android:title="@string/preference_notifications_days_before"
+            android:key="notifications_days_before_expiration"
+            android:summary="@string/preference_notifications_days_before_summary"
+            android:entries="@array/notification_preferences_list_entries"
+            android:entryValues="@array/notification_preferences_list_values"
+            android:defaultValue="3"
+            />
+    </PreferenceCategory>
 </PreferenceScreen> 
\ No newline at end of file
-- 
2.11.0