Caldav: merge #480 Teach fixVCalendar to convert TZIDs individually

git-svn-id: https://svn.code.sf.net/p/davmail/code/trunk@4096 3d1905a2-6b24-0410-a738-b14d5a86fcbd

Author: mguessan

src/java/davmail/exchange/VCalendar.java

@@ -180,25 +180,12 @@ protected void fixVCalendar(boolean fromServer) {
         }
 
         // rename TZID for maximum iCal/iPhone compatibility
-        String tzid = null;
         if (fromServer) {
             // get current tzid
             VObject vObject = vTimezone;
             if (vObject != null) {
                 String currentTzid = vObject.getPropertyValue("TZID");
-                // fix TZID with \n (Exchange 2010 bug)
-                if (currentTzid != null && currentTzid.endsWith("\n")) {
-                    currentTzid = currentTzid.substring(0, currentTzid.length() - 1);
-                    vObject.setPropertyValue("TZID", currentTzid);
-                }
-                if (currentTzid != null && currentTzid.indexOf(' ') >= 0) {
-                    try {
-                        tzid = ResourceBundle.getBundle("timezones").getString(currentTzid);
-                        vObject.setPropertyValue("TZID", tzid);
-                    } catch (MissingResourceException e) {
-                        LOGGER.debug("Timezone " + currentTzid + " not found in rename table");
-                    }
-                }
+                vObject.setPropertyValue("TZID", fixupTZID(currentTzid));
             }
         }
 
@@ -253,24 +240,22 @@ protected void fixVCalendar(boolean fromServer) {
                     if ("".equals(vObject.getPropertyValue("CLASS"))) {
                         vObject.removeProperty("CLASS");
                     }
-                    // rename TZID
-                    if (tzid != null) {
-                        VProperty dtStart = vObject.getProperty("DTSTART");
-                        if (dtStart != null && dtStart.getParam("TZID") != null) {
-                            dtStart.setParam("TZID", tzid);
-                        }
-                        VProperty dtEnd = vObject.getProperty("DTEND");
-                        if (dtEnd != null && dtEnd.getParam("TZID") != null) {
-                            dtEnd.setParam("TZID", tzid);
-                        }
-                        VProperty recurrenceId = vObject.getProperty("RECURRENCE-ID");
-                        if (recurrenceId != null && recurrenceId.getParam("TZID") != null) {
-                            recurrenceId.setParam("TZID", tzid);
-                        }
-                        VProperty exDate = vObject.getProperty("EXDATE");
-                        if (exDate != null && exDate.getParam("TZID") != null) {
-                            exDate.setParam("TZID", tzid);
-                        }
+                    // rename TZIDs
+                    VProperty dtStart = vObject.getProperty("DTSTART");
+                    if (dtStart != null && dtStart.getParam("TZID") != null) {
+                        dtStart.setParam("TZID", fixupTZID(dtStart.getParamValue("TZID")));
+                    }
+                    VProperty dtEnd = vObject.getProperty("DTEND");
+                    if (dtEnd != null && dtEnd.getParam("TZID") != null) {
+                        dtEnd.setParam("TZID", fixupTZID(dtEnd.getParamValue("TZID")));
+                    }
+                    VProperty recurrenceId = vObject.getProperty("RECURRENCE-ID");
+                    if (recurrenceId != null && recurrenceId.getParam("TZID") != null) {
+                        recurrenceId.setParam("TZID", fixupTZID(recurrenceId.getParamValue("TZID")));
+                    }
+                    VProperty exDate = vObject.getProperty("EXDATE");
+                    if (exDate != null && exDate.getParam("TZID") != null) {
+                        exDate.setParam("TZID", fixupTZID(exDate.getParamValue("TZID")));
                     }
                     // remove unsupported attachment reference
                     if (vObject.getProperty("ATTACH") != null) {
@@ -324,6 +309,21 @@ protected void fixVCalendar(boolean fromServer) {
 
     }
 
+    private String fixupTZID(String currentTzid) {
+        // fix TZID with \n (Exchange 2010 bug)
+        if (currentTzid != null && currentTzid.endsWith("\n")) {
+            currentTzid = currentTzid.substring(0, currentTzid.length() - 1);
+        }
+        if (currentTzid != null && currentTzid.indexOf(' ') >= 0) {
+            try {
+                currentTzid = ResourceBundle.getBundle("timezones").getString(currentTzid);
+            } catch (MissingResourceException e) {
+                LOGGER.debug("Timezone " + currentTzid + " not found in rename table");
+            }
+        }
+        return currentTzid;
+    }
+
     private void fixTimezoneToServer() {
         if (vTimezone != null && vTimezone.vObjects != null && vTimezone.vObjects.size() > 2) {
             VObject standard = null;
@@ -361,7 +361,7 @@ private void fixTimezoneToServer() {
                 }
             }
         }
-        
+
         // validate RRULE - COUNT and UNTIL may not occur at once
         if (vTimezone != null && vTimezone.vObjects != null) {
             for (VObject vObject : vTimezone.vObjects) {
@@ -375,7 +375,7 @@ private void fixTimezoneToServer() {
             }
         }
         // end validate RRULE
-        
+
         // convert TZID to Exchange time zone id
         ResourceBundle tzBundle = ResourceBundle.getBundle("exchtimezones");
         ResourceBundle tzidsBundle = ResourceBundle.getBundle("stdtimezones");