Changeset 153

Timestamp:

01/17/08 23:13:03 (11 months ago)

Author:

cyrusdaboo

Message:

Fix crash when no address book exists in CardDAV. Enable component level synchronization
with CardDAV.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CAdbkProtocol.cp (modified) (19 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CAdbkProtocol.cp

@@ -45 +45 @@
 
 #include "CVCardAddressBook.h"
+#include "CVCardMapper.h"
 #include "CVCardSync.h"
+#include "CVCardVCard.h"
 
 #include "cdfstream.h"
@@ -679 +681 @@
                                         break;
                                 case CINETAccount::eCardDAVAdbk:
-                                        for(CAddressBookList::const_iterator niter = mStoreRoot.GetChildren()->begin();
-                                                niter != mStoreRoot.GetChildren()->end(); niter++)
+                                        if (mStoreRoot.GetChildren() != NULL)
                                         {
-                                                if ((*niter)->IsAdbk())
+                                                for(CAddressBookList::const_iterator niter = mStoreRoot.GetChildren()->begin();
+                                                        niter != mStoreRoot.GetChildren()->end(); niter++)
                                                 {
-                                                        if (adbk)
+                                                        if ((*niter)->IsAdbk())
                                                         {
-                                                                adbk = NULL;
-                                                                break;
+                                                                if (adbk)
+                                                                {
+                                                                        adbk = NULL;
+                                                                        break;
+                                                                }
+                                                                else
+                                                                        adbk = *niter;
                                                         }
-                                                        else
-                                                                adbk = *niter;
                                                 }
                                         }
@@ -1087 +1092 @@
 void CAdbkProtocol::SyncComponentsFromServer(CAddressBook* adbk)
 {
-#if 0
         // We need to do this as a proper transaction with locking
         try
@@ -1098 +1102 @@
                 //  2.1 Add new components to server and cache info
                 //  2.2 Remove deleted components from server and cached server info if still present on server
-                //  2.3 Cache info for changed items for later sync (or change them immediately if the server has not changed
+                //  2.3 Cache info for changed items for later sync (or change them immediately if the server has not changed)
                 //
                 // 3. Scan list of local components
@@ -1118 +1122 @@
 
                 // Step 1
+                vCard::CVCardAddressBook* vadbk = adbk->GetVCardAdbk();
+                CCardDAVVCardClient* cardclient = static_cast<CCardDAVVCardClient*>(mClient);
                 cdstrmap comps;
                 bool server_changed = mClient->_AdbkChanged(adbk);
                 if (server_changed)
-                        mClient->_GetComponentInfo(adbk, vadbk, comps);
+                        cardclient->_GetComponentInfo(adbk, *vadbk, comps);
                 else
                 {
@@ -1130 +1136 @@
                 cdstrmap cache_added;
                 cdstrmap cache_changed;
-                for(vcard::CVCardComponentRecordDB::const_iterator iter = adbk->GetRecording().begin(); iter != adbk->GetRecording().end(); iter++)
+                for(vCard::CVCardComponentRecordDB::const_iterator iter = vadbk->GetRecording().begin(); iter != vadbk->GetRecording().end(); iter++)
                 {
                         // Step 2.1
-                        if ((*iter).second.GetAction() == vcard::CVCardComponentRecord::eAdded)
+                        if ((*iter).second.GetAction() == vCard::CVCardComponentRecord::eAdded)
                         {
                                 // Add component to server
-                                const iCal::CICalendarComponent* comp = cal.GetComponentByKey((*iter).first);
+                                const vCard::CVCardVCard* comp = vadbk->GetCardByKey((*iter).first);
                                 if (comp != NULL)
                                 {
                                         // Add component to server
-                                        mClient->_AddComponent(node, cal, *comp);
+                                        cardclient->_AddComponent(adbk, *vadbk, *comp);
 
                                         // Add to added cache
@@ -1148 +1154 @@
                         
                         // Step 2.2
-                        else if ((*iter).second.GetAction() == iCal::CICalendarComponentRecord::eRemoved)
+                        else if ((*iter).second.GetAction() == vCard::CVCardComponentRecord::eRemoved)
                         {
                                 // Is it still present on the server
@@ -1154 +1160 @@
                                 {
                                         // Remove component from server
-                                        mClient->_RemoveComponent(node, cal, (*iter).second.GetRURL());
+                                        cardclient->_RemoveComponent(adbk, *vadbk, (*iter).second.GetRURL());
                                         
                                         // Remove from server component info
@@ -1162 +1168 @@
 
                         // Step 2.3
-                        else if ((*iter).second.GetAction() == iCal::CICalendarComponentRecord::eChanged)
+                        else if ((*iter).second.GetAction() == vCard::CVCardComponentRecord::eChanged)
                         {
                                 if (server_changed)
@@ -1169 +1175 @@
                                 {
                                         // Change it on the server
-                                        const iCal::CICalendarComponent* comp = cal.GetComponentByKey((*iter).first);
-                                        mClient->_ChangeComponent(node, cal, *comp);
+                                        const vCard::CVCardVCard* comp = vadbk->GetCardByKey((*iter).first);
+                                        cardclient->_ChangeComponent(adbk, *vadbk, *comp);
                                         cache_changed.insert(cdstrmap::value_type((*iter).second.GetRURL(), (*iter).second.GetETag()));
                                 }
@@ -1181 +1187 @@
                 {
                         // Get component info from cache
-                        iCal::CICalendarComponentDBList dbs;
-                        cal.GetAllDBs(dbs);
                         cdstrvect component_keys;
-                        for(iCal::CICalendarComponentDBList::const_iterator iter1 = dbs.begin(); iter1 != dbs.end(); iter1++)
+                        for(vCard::CVCardComponentDB::const_iterator iter = vadbk->GetVCards().begin(); iter != vadbk->GetVCards().end(); iter++)
                         {
-                                for(iCal::CICalendarComponentDB::const_iterator iter2 = (*iter1)->begin(); iter2 != (*iter1)->end(); iter2++)
-                                {
-                                        component_keys.push_back((*iter2).second->GetMapKey());
-                                }
+                                component_keys.push_back((*iter).second->GetMapKey());
                         }
                         
@@ -1196 +1197 @@
                         for(cdstrvect::const_iterator iter = component_keys.begin(); iter != component_keys.end(); iter++)
                         {
-                                iCal::CICalendarComponent* cache_comp = cal.GetComponentByKey(*iter);
+                                vCard::CVCardVCard* cache_comp = vadbk->GetCardByKey(*iter);
                                 if (cache_comp == NULL)
                                         continue;
@@ -1225 +1226 @@
                                         {
                                                 // Write changed cache component to server
-                                                mClient->_ChangeComponent(node, cal, *cache_comp);
+                                                cardclient->_ChangeComponent(adbk, *vadbk, *cache_comp);
                                         }
                                         
@@ -1233 +1234 @@
                                                 // Do iCal SEQ etc comparison
                                                 
-                                                // First read in component from server into temp calendar
-                                                iCal::CICalendar tempcal;
-                                                iCal::CICalendarComponent* server_comp = mClient->_ReadComponent(node, tempcal, server_rurl);
+                                                // First read in component from server into temp addressbook
+                                                vCard::CVCardAddressBook tempvcard;
+                                                vCard::CVCardVCard* server_comp = cardclient->_ReadComponent(adbk, tempvcard, server_rurl);
                                                 if (server_comp != NULL)
                                                 {
-                                                        int result = iCal::CICalendarSync::CompareComponentVersions(server_comp, cache_comp);
+                                                        int result = -1; //iCal::CICalendarSync::CompareComponentVersions(server_comp, cache_comp);
                                                         
                                                         if (result == 1)
                                                         {
                                                                 // Cache is newer than server - cache overwrites to server
-                                                                mClient->_ChangeComponent(node, cal, *cache_comp);
+                                                                cardclient->_ChangeComponent(adbk, *vadbk, *cache_comp);
                                                         }
                                                         else if (result == -1)
@@ -1250 +1251 @@
 
                                                                 // Remove the cached component first
-                                                                cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                                                vadbk->RemoveCardByKey(cache_comp->GetMapKey());
                                                                 cache_comp = NULL;
                                                                 
                                                                 // Copy component from server into local cache effectively replacing old one
-                                                                iCal::CICalendarComponent* new_comp = server_comp->clone();
-                                                                new_comp->SetCalendar(cal.GetRef());
-                                                                cal.AddComponent(new_comp);
+                                                                vCard::CVCardComponent* new_comp = server_comp->clone();
+                                                                new_comp->SetAddressBook(vadbk->GetRef());
+                                                                vadbk->AddCard(new_comp);
                                                         }
                                                 }
@@ -1271 +1272 @@
                                                 
                                                 // Remove the cached component first
-                                                cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                                vadbk->RemoveCardByKey(cache_comp->GetMapKey());
                                                 cache_comp = NULL;
                                                 
                                                 // Read component from server into local cache effectively replacing old one
-                                                mClient->_ReadComponent(node, cal, server_rurl);
+                                                cardclient->_ReadComponent(adbk, *vadbk, server_rurl);
                                         }
                                 }
@@ -1283 +1284 @@
                                 {
                                         // comp is deleted in this call
-                                        cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                        vadbk->RemoveCardByKey(cache_comp->GetMapKey());
                                         cache_comp = NULL;
                                 }
@@ -1303 +1304 @@
                         // Read components from server into local cache as its a new one on the server
                         if (rurls.size() != 0)
-                                mClient->_ReadComponents(node, cal, rurls);
+                                cardclient->_ReadComponents(adbk, *vadbk, rurls);
                 }
 
                 // Clear out cache recording
-                cal.ClearRecording();
+                vadbk->ClearRecording();
                 
                 // Get the current server sync token
-                mClient->_UpdateSyncToken(node, cal);
+                cardclient->_UpdateSyncToken(adbk);
 
                 // Now write back cache
-                if (!mCacheClient->_TouchCalendar(node))
-                        DumpCalendars();
-                mCacheClient->_WriteFullCalendar(node, cal);
+                if (!mCacheClient->_TouchAdbk(adbk))
+                        DumpAddressBooks();
+                mCacheClient->_WriteFullAddressBook(adbk);
+        
+                // Now map VCards into internal addresses
+                vcardstore::MapFromVCards(adbk);
         }
         catch(...)
@@ -1324 +1328 @@
                 throw;
         }
-#endif
 }