X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr-tasks.cpp;h=2efca05656e416fead92e74cab96f6fb2363a6b6;hb=700c6a4c98319bc09eeb5c0905a5dafac8aa61cc;hp=fe6eb3dfb7871199cd15052c72e0a0cdce662ce0;hpb=17ceb4e3a5a0b0fdb902775773699bfbbccc7b5c;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index fe6eb3d..2efca05 100644
--- 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.
 	
@@ -79,9 +82,14 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 	
 	}
 	
-	CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
-	CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
-	CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);		
+	ActivityMgrAccountSettings AccountSettings;
+	AccountSettings.Address = AccountAddress;
+	AccountSettings.Port = AccountPort;
+	AccountSettings.Username = AccountUsername;
+	AccountSettings.Password = AccountPassword;
+	AccountSettings.SSL = AccountSSL;
+	AccountSettings.Prefix = AccountPrefix;
+	AccountSettings.Dir = AccountDir;	
 
 	// TaskType:
 	// 0 - Add a contact.
@@ -97,21 +105,24 @@ 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));
 		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 +136,22 @@ 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));
 		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)));
@@ -154,13 +167,18 @@ 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));
 	
 	} else if (TaskType == 3){
 
@@ -170,19 +188,23 @@ 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));
 	
 	}
 	
 	ProcessTasksData = TRUE;
 	
-	if (!ActProcessTimer.IsRunning()) {
+	if (!ActProcessTimer.IsRunning() && ApplicationSleepMode == FALSE) {
 	
 		wxCommandEvent event(ACTMGR_STARTTIMER);
 		wxPostEvent(this, event);
@@ -224,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"));
 
 }
@@ -253,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);