Removed references of CardDAV and delete ConnectionObject when finished

[xestiaab/.git] / source / actmgr / frmActivityMgr-tasks.cpp

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index 72135db..842598d 100644 (file)
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -26,12 +26,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 
        wxListItem coldata;
        long itemindex = -1;
-       CardDAV* CardDAVConn = new CardDAV;
 
        coldata.SetId(ActivityTaskID);
        coldata.SetData(ActivityTaskID);
 
-       AnimationTimer.StartAnimation();
+       if (ApplicationSleepMode == FALSE){
+               
+               AnimationTimer.StartAnimation();
+               
+       }
 
        // Get the preferences file.
        
@@ -86,11 +89,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
        AccountSettings.Password = AccountPassword;
        AccountSettings.SSL = AccountSSL;
        AccountSettings.Prefix = AccountPrefix;
-       AccountSettings.Dir = AccountDir;
-       
-       CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
-       CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
-       CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);          
+       AccountSettings.Dir = AccountDir;       
 
        // TaskType:
        // 0 - Add a contact.
@@ -106,16 +105,18 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                lstActivity->SetItem(itemindex, 1, AccountName);
                lstActivity->SetItem(itemindex, 2, _("Queued"));
                
-               CardDAVConn->SetUploadMode(TRUE);
-               CardDAVConn->SetupData(wxT("PUT"), TaskURL, TaskData);
-               
                // Setup all of the task details.
 
                ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
                
+               CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+               ConnObject->SetupConnectionObject();
+               
                ActivityListType.insert(std::make_pair(ActivityTaskID, 0));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
-               ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
+               ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
+               ActivityListEditMode.insert(std::make_pair(ActivityTaskID, false));
+               ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
@@ -135,15 +136,16 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                lstActivity->SetItem(itemindex, 1, AccountName);
                lstActivity->SetItem(itemindex, 2, _("Queued"));
                
-               CardDAVConn->SetUploadMode(TRUE);
-               CardDAVConn->SetupData(wxT("PUT"), TaskURL, TaskData);
-               CardDAVConn->SetEditMode(TRUE);
-               
                ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
+
+               CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+               ConnObject->SetupConnectionObject();
                
                ActivityListType.insert(std::make_pair(ActivityTaskID, 1));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
-               ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
+               ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
+               ActivityListEditMode.insert(std::make_pair(ActivityTaskID, true));
+               ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
@@ -165,12 +167,16 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                
                ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
                
+               CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+               ConnObject->SetupConnectionObject();
+               
                ActivityList.insert(std::make_pair(ActivityTaskID, 0));
                ActivityListType.insert(std::make_pair(ActivityTaskID, 2));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
+               ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
-               ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
+               ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
@@ -182,12 +188,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                lstActivity->SetItem(itemindex, 1, AccountName);
                lstActivity->SetItem(itemindex, 2, _("Queued"));
                
+               CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+               ConnObject->SetupConnectionObject();
+               
                ActivityList.insert(std::make_pair(ActivityTaskID, 0));
                ActivityListType.insert(std::make_pair(ActivityTaskID, 3));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
-               ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
+               ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
@@ -195,7 +204,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
        
        ProcessTasksData = TRUE;
        
-       if (!ActProcessTimer.IsRunning()) {
+       if (!ActProcessTimer.IsRunning() && ApplicationSleepMode == FALSE) {
        
                wxCommandEvent event(ACTMGR_STARTTIMER);
                wxPostEvent(this, event);
@@ -237,12 +246,6 @@ void frmActivityMgr::StopTask( wxCommandEvent& event ){
                return;
        }
        
-       std::map<int,CardDAV*>::iterator CDAVter;
-       
-       CDAVter = ActivityListConn.find(intSelectedData);
-       
-       CDAVter->second->Abort();
-       
        lstActivity->SetItem(longSelected, 2, _("Stopped"));
 
 }
@@ -266,12 +269,6 @@ void frmActivityMgr::StopAllTasks( wxCommandEvent& event ){
                return;
        }
        
-       std::map<int,CardDAV*>::iterator CDAVter;
-       
-       CDAVter = ActivityListConn.find(intSelectedData);
-       
-       CDAVter->second->Abort();
-       
        lstActivity->SetItem(longSelected, 2, _("Stopped"));
        AnimationTimer.StopAnimation();
        bmpActivity->SetBitmap(SleepBitmap);
@@ -296,10 +293,6 @@ void frmActivityMgr::RetryTask( wxCommandEvent& event ){
                return;
        }
        
-       std::map<int,CardDAV*>::iterator CDAVter;
-       
-       CDAVter = ActivityListConn.find(intSelectedData);
-       
        // Restart the task.
        
        //CDAVter->second.Abort();