wxListItem coldata;
long itemindex = -1;
- CardDAV* CardDAVConn = new CardDAV;
coldata.SetId(ActivityTaskID);
coldata.SetData(ActivityTaskID);
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.
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));
ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
ActivityListEditMode.insert(std::make_pair(ActivityTaskID, false));
- ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
+ 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));
lstActivity->SetItem(itemindex, 2, _("Queued"));
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));
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));
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));
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));
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));
return;
}
- std::map<int,CardDAV*>::iterator CDAVter;
-
- CDAVter = ActivityListConn.find(intSelectedData);
-
- CDAVter->second->Abort();
-
lstActivity->SetItem(longSelected, 2, _("Stopped"));
}
return;
}
- std::map<int,CardDAV*>::iterator CDAVter;
-
- CDAVter = ActivityListConn.find(intSelectedData);
-
- CDAVter->second->Abort();
-
lstActivity->SetItem(longSelected, 2, _("Stopped"));
AnimationTimer.StopAnimation();
bmpActivity->SetBitmap(SleepBitmap);
return;
}
- std::map<int,CardDAV*>::iterator CDAVter;
-
- CDAVter = ActivityListConn.find(intSelectedData);
-
// Restart the task.
//CDAVter->second.Abort();