Altered frmActivityMgr to accommodate for SSL support for OS X (and other OSes in...

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

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index fe6eb3d..8aa7d1e 100644 (file)
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -79,6 +79,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
        
        }
        
+       ActivityMgrAccountSettings AccountSettings;
+       AccountSettings.Address = AccountAddress;
+       AccountSettings.Port = AccountPort;
+       AccountSettings.Username = AccountUsername;
+       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);          
@@ -106,12 +115,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                
                ActivityListType.insert(std::make_pair(ActivityTaskID, 0));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
+               ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
+               ActivityListEditMode.insert(std::make_pair(ActivityTaskID, false));
                ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
+               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
                
                ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
                ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -125,20 +137,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);
-               CardDAVConn->SetEditMode(TRUE);
-               
                ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
                
                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));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
+               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
                
                ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
                ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -158,9 +168,9 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListType.insert(std::make_pair(ActivityTaskID, 2));
                ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
-               ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
+               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
        } else if (TaskType == 3){
 
@@ -177,6 +187,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
+               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
        }