fixed settings being lost when updating to a newer version. Also updated readme and...

diff --git a/Readme.txt b/Readme.txt
index 390264caad9c88e103f2dc4cb45e322d06ed452f..bd5ab8e6529a89612cf416b79828fa4b48fe94db 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -262,9 +262,10 @@ Changelog:
   - fixed calendar indicators not showing in some cases\r
   - fixed homescreen widget not updating properly on N8\r
   - added help menu\r
-1.32 () by Michael Prager
-  - improved performance and battery life (reloading and sorting calendar 
-    data has been reduced)
-  - fixed and improved spanish translation
-  - added "enableLogging" option which needs to be turned on if you want to 
-    generate debug logs
+1.32 () by Michael Prager\r
+  - improved performance and battery life (reloading and sorting calendar \r
+    data has been reduced)\r
+  - fixed settings being lost when updating to a newer version\r
+  - fixed and improved spanish translation\r
+  - added "enableLogging" option which needs to be turned on if you want to \r
+    generate debug logs\r

diff --git a/comingNext/index.html b/comingNext/index.html
index 10e23093fe9bf031da13f6d5115dbd7c34d07a1a..48610ac92986ba853b303ad8ab4a2e468d6a8b5c 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -1066,8 +1066,8 @@ function getSettingsCalEntryId()
                var listFiltering = {\r
                        Type:'CalendarEntry', \r
                        Filter:{\r
-                               StartRange: new Date(2000, 0, 1),\r
-                               EndRange: new Date(2000, 0, 1),\r
+                               StartRange: new Date(1999, 11, 30), // note: due to Nokia's buggy calendar API, the settings event can be on 01.01.2000 AND on 31.12.1999, depending on when the calendar entry was created (in summer or winter). It is not even possible to narrow the search down to these two days (probably because of DST offsets). So we're looking for an event between 30.12.1999 and 02.01.2000!\r
+                               EndRange: new Date(2000, 0, 2),\r
                                SearchText: 'ComingNext Settings|',\r
                                Type: 'DayEvent'\r
                        }\r
@@ -1139,6 +1139,10 @@ function loadSettings()
                                var pair = stringlist[i].split('=');\r
                                var key = pair[0];\r
                                var value = pair[1];\r
+                               if (key == null || value == null || config[key] == null) {\r
+                                       log('Warning: unknown or invalid setting: ' + stringlist[i]);\r
+                                       continue;\r
+                               }\r
                                log('stringlist: ' + key + '=\'' + value + '\'');\r
                                if (config[key].Type == 'Int') {\r
                                        config[key].Value = Number(value);\r