coldata.SetId(ActivityTaskID);
coldata.SetData(ActivityTaskID);
- AnimationTimer.StartAnimation();
+ if (ApplicationSleepMode == FALSE){
+
+ AnimationTimer.StartAnimation();
+
+ }
// Get the preferences file.
}
+ 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);
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));
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)));
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)));
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){
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));
}
ProcessTasksData = TRUE;
- if (!ActProcessTimer.IsRunning()) {
+ if (!ActProcessTimer.IsRunning() && ApplicationSleepMode == FALSE) {
wxCommandEvent event(ACTMGR_STARTTIMER);
wxPostEvent(this, event);