Changeset 1482

Timestamp:

11/28/06 22:07:20 (2 years ago)

Author:

dgollub

Message:

added workaround for mobile phones which only supports localtime.
Plugin config option for this workaround is:
<onlyLocaltime></onlyLocaltime>

This is needed by Nokia 6230, 6230i, 6280, ...

Location:

plugins/syncml/src

Files:

• syncml-http-server (modified) (1 diff)
• syncml-obex-client (modified) (1 diff)
• syncml_plugin.c (modified) (4 diffs)
• syncml_plugin.h (modified) (1 diff)

plugins/syncml/src/syncml-http-server

@@ -19 +19 @@
   <onlyreplace>0</onlyreplace>
   
+  <!-- Workaround around for mobile phones which only use local timestamps and _no_ UTC timestamps! -->
+  <onlyLocaltime>0</onlyLocaltime>
+
   <!-- Sets the maximum allowed size in bytes of incoming messages (some device need this option set). Example: 10000 -->
   <recvLimit>0</recvLimit>

plugins/syncml/src/syncml-obex-client

@@ -33 +33 @@
   <!-- Never send ADD command, but send REPLACE (not needed normally) -->
   <onlyreplace>0</onlyreplace>
+
+  <!-- Workaround around for mobile phones which only use local timestamps and _no_ UTC timestamps! -->
+  <onlyLocaltime>0</onlyLocaltime>
   
   <!-- Sets the maximum allowed size in bytes of incoming messages (some device need this option set). Example: 10000 -->

plugins/syncml/src/syncml_plugin.c

@@ -117 +117 @@
                                 osync_change_set_objformat_string(change, "memo");
                 }
-                
-                osync_change_set_data(change, data, size, TRUE);
+
+                /* XXX Workaround for mobiles which only handle localtime! */
+                char *_data = g_strdup(data);
+                if (!strcmp(contenttype, SML_ELEMENT_TEXT_VCAL) && env->onlyLocaltime) {
+                        g_free(_data);
+                        _data = osync_time_vcal2utc(data);
+
+                }
+                
+                osync_change_set_data(change, _data, size, TRUE);
                 osync_change_set_changetype(change, _to_osync_changetype(type));
                 osync_context_report_change((OSyncContext *)userdata, change);
+                g_free(_data);
+
         } else
                 osync_context_report_success((OSyncContext *)userdata);
@@ -457 +467 @@
                                 env->useStringtable = atoi(str);
                         }
-                        
+
+                        /* XXX Workaround for mobiles which only handle localtime! */
+                        if (!xmlStrcmp(cur->name, (const xmlChar *)"onlyLocaltime")) {
+                                env->onlyLocaltime = atoi(str);
+                        }
+                
                         if (!xmlStrcmp(cur->name, (const xmlChar *)"onlyreplace")) {
                                 env->onlyReplace = atoi(str);
@@ -778 +793 @@
                                 env->maxObjSize = atoi(str);
                         }
+
+                        /* XXX Workaround for mobiles which only handle localtime! */
+                        if (!xmlStrcmp(cur->name, (const xmlChar *)"onlyLocaltime")) {
+                                env->onlyLocaltime = atoi(str);
+                        }
                         
                         if (!xmlStrcmp(cur->name, (const xmlChar *)"contact_db")) {
@@ -1212 +1232 @@
                                 tracer->change = change;
                                 tracer->context = context;
-        
-                        
-                                if (!smlDsSessionQueueChange(env->calendarSession, _get_changetype(change), osync_change_get_uid(change), osync_change_get_data(change), osync_change_get_datasize(change), _format_to_contenttype(change), _recv_change_reply, tracer, &error))
+
+                                /* XXX Workaround for mobiles which only handle localtime! */
+                                char *calentry = g_strdup(osync_change_get_data(change));
+                                if (env->onlyLocaltime) {
+                                        g_free(calentry);
+                                        const char *orig_stamp = osync_change_get_data(change);
+                                        calentry = osync_time_vcal2localtime(orig_stamp);
+                                }
+        
+                                if (!smlDsSessionQueueChange(env->calendarSession, _get_changetype(change), osync_change_get_uid(change), calentry, strlen(calentry), _format_to_contenttype(change), _recv_change_reply, tracer, &error)) {
+                                        g_free(calentry);
                                         goto error;
+                                }
                                 contexts[i] = NULL;
+                                g_free(calentry);
+
                         }
                 }

plugins/syncml/src/syncml_plugin.h

@@ -62 +62 @@
         SmlBool useStringtable;
         SmlBool onlyReplace;
+        SmlBool onlyLocaltime;
         SmlTransportObexClientType type;
         unsigned int port;