From 2b77cbef55ffd11691ff480aced81914d1d5c290 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 21 Dec 2011 07:47:36 +0000
Subject: [PATCH] Caldav: Create a new davmail.caldavEnableLegacyTasks to allow
 access to tasks created in calendar folder by previous DavMail versions

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1866 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 .../davmail/exchange/dav/DavExchangeSession.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 7da7fd17..a943395f 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -2099,10 +2099,18 @@ public class DavExchangeSession extends ExchangeSession {
 
     @Override
     protected Condition getCalendarItemCondition(Condition dateCondition) {
-        // instancetype 0 single appointment / 1 master recurring appointment
-        return and(isEqualTo("outlookmessageclass", "IPM.Appointment"),
-                or(isEqualTo("instancetype", 1),
-                        and(isEqualTo("instancetype", 0), dateCondition)));
+        boolean caldavEnableLegacyTasks = Settings.getBooleanProperty("davmail.caldavEnableLegacyTasks", false);
+        if (caldavEnableLegacyTasks) {
+            // return tasks created in calendar folder
+             return or(isNull("instancetype"),
+                    isEqualTo("instancetype", 1),
+                    and(isEqualTo("instancetype", 0), dateCondition));
+        } else {
+            // instancetype 0 single appointment / 1 master recurring appointment
+            return and(isEqualTo("outlookmessageclass", "IPM.Appointment"),
+                    or(isEqualTo("instancetype", 1),
+                            and(isEqualTo("instancetype", 0), dateCondition)));
+        }
     }
 
     protected MultiStatusResponse[] searchItems(String folderPath, Set<String> attributes, Condition condition,