X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.cpp;h=e60ce73d37a8932a6d51c91332bb2bcfdc91e98a;hb=c58983d98dc0bcaceef7bfd3421a7710f3bd8fc0;hp=aeb28cbb10839934ab683a8aa346340bcad9ae39;hpb=108e3725dc07949bb3219644aacef219879264a7;p=xestiaab%2F.git diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp index aeb28cb..e60ce73 100644 --- a/source/actmgr/frmActivityMgr.cpp +++ b/source/actmgr/frmActivityMgr.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "../bitmaps.h" @@ -37,9 +38,6 @@ #include "../vcard/vcard34conv.h" #include "../vcard/vcard.h" -#ifndef FRMACTIVITYMGR_H -#define FRMACTIVITYMGR_H - DEFINE_EVENT_TYPE(ACTMGR_RESUMEPROC); DEFINE_EVENT_TYPE(ACTMGR_TOGGLECONN); DEFINE_EVENT_TYPE(ACTMGR_STARTTIMER); @@ -47,6 +45,7 @@ DEFINE_EVENT_TYPE(ACTMGR_STOPTIMER); DEFINE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER); DEFINE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER); DEFINE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL); +DEFINE_EVENT_TYPE(ACTMGR_STARTANIMATIONTIMER); BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow) EVT_COMMAND(wxID_ANY, ACTMGR_RESUMEPROC, frmActivityMgr::ResumeProcessing) @@ -56,6 +55,7 @@ BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow) EVT_COMMAND(wxID_ANY, ACTMGR_STARTPROCESSTIMER, frmActivityMgr::StartProcessTimer) EVT_COMMAND(wxID_ANY, ACTMGR_STOPPROCESSTIMER, frmActivityMgr::StopProcessTimer) EVT_COMMAND(wxID_ANY, ACTMGR_UPDATESTATUSLABEL, frmActivityMgr::UpdateStatusLabel) + EVT_COMMAND(wxID_ANY, ACTMGR_STARTANIMATIONTIMER, frmActivityMgr::StartAnimationTimer) END_EVENT_TABLE() frmActivityMgr::frmActivityMgr( wxWindow* parent ) @@ -196,8 +196,16 @@ void frmActivityMgr::ProcessTasksThread() } + if (ApplicationSleepMode == TRUE){ + + return; + + } + std::map::iterator TypeIter; std::map::iterator StringIter; + std::map::iterator StringDataIter; + std::map::iterator StringURLIter; std::map::iterator StringDetailIter; std::map::iterator StringAccountIter; std::map::iterator StringFilenameIter; @@ -206,10 +214,12 @@ void frmActivityMgr::ProcessTasksThread() std::map::iterator StringETagIter; std::map::iterator StringETagOrigIter; std::map::iterator CardDAVIter; + std::map::iterator ConnObjectIter; + std::map::iterator AccountSettingsIter; std::map::iterator LongIter; bool TasksFoundProc = FALSE; wxString TaskDetail; - + for (std::map::iterator iter = ActivityList.begin(); iter != ActivityList.end(); ++iter){ @@ -219,13 +229,35 @@ void frmActivityMgr::ProcessTasksThread() continue; } + wxCommandEvent StartAnimationEvent(ACTMGR_STARTANIMATIONTIMER); + + wxPostEvent(this, StartAnimationEvent); + + // Start the animation timer if it hasn't started. + CardDAVIter = ActivityListConn.find(iter->first); + ConnObjectIter = ActivityListConnObject.find(iter->first); TypeIter = ActivityListType.find(iter->first); StringETagIter = ActivityListETag.find(iter->first); StringETagOrigIter = ActivityListETagOriginal.find(iter->first); StringAccountIter = ActivityListAccount.find(iter->first); StringFilenameIter = ActivityListFilename.find(iter->first); StringFullFilenameIter = ActivityListFullFilename.find(iter->first); + AccountSettingsIter = ActivityListAccSettings.find(iter->first); + + // Setup the CardDAV object. + + CardDAV ConnHandle; + + ConnHandle.SetupConnection(AccountSettingsIter->second.Address, + AccountSettingsIter->second.Port, + AccountSettingsIter->second.Username, + AccountSettingsIter->second.Password, + AccountSettingsIter->second.SSL, + AccountSettingsIter->second.Prefix, + AccountSettingsIter->second.Dir); + ConnHandle.SetupVariables(&ActivityList, iter->first); + ConnHandle.SetupResultBools(&BlankBool, &BlankBool); // 0 = Queued. // 1 = Processing. @@ -237,6 +269,9 @@ void frmActivityMgr::ProcessTasksThread() // 7 = (Reserved) (UI Updated). // 8 = Completed. (UI Updated). + frmMain *frmMainPtrGet = static_cast(frmMainPtr); + XABPreferences PrefData(GetUserPrefDir()); + if (iter->second == 0){ //CardDAVIter->second. @@ -252,267 +287,1246 @@ void frmActivityMgr::ProcessTasksThread() wxString ContactFilename; wxString FullFilename; wxString ETagResult; + bool EditMode = FALSE; iter->second = 1; - if (TypeIter->second == 1){ - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); - } - // Compare the ETags and work out if a conflict has occured. - if (TypeIter->second == 1){ - + if (TypeIter->second == 0){ + + // Add a contact. + + StringDataIter = ActivityListData.find(iter->first); + StringURLIter = ActivityListURL.find(iter->first); + + AccountDir = StringAccountIter->second; + ContactFilename = StringFilenameIter->second; + wxString AccountNameFriendly; + + int AccountID = 0; + + for (int i = 0; i < PrefData.accounts.GetCount(); i++){ + + wxString AccountDirCheck = PrefData.accounts.GetAccountDirectory(i); + + AccountDirCheck.Trim(); + AccountDirCheck.Append(wxT(".carddav")); + + if (AccountDirCheck == StringAccountIter->second){ + + AccountNameFriendly = PrefData.accounts.GetAccountName(i); + AccountID = i; + + } + + } + + ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); + ETag = StringETagIter->second; ETagOriginal = StringETagOrigIter->second; AccountDir = StringAccountIter->second; ContactFilename = StringFilenameIter->second; FullFilename = StringFullFilenameIter->second; + EditMode = ActivityListEditMode.find(iter->first)->second; - ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); - - /*if (ETag == ETagOriginal){*/ - - // Compare the ETag with the Server ETag. - - if (ETagOriginal != ETagServer){ + bool KeepUpdating = true; - // Server ETag is different from original ETag. - // This is a conflict which the user will now - // need to resolve. + while(KeepUpdating == true){ - vCard Moo1; - vCard Moo2; + COConnectResult ConnectResponse = ConnObjectIter->second->Connect(false); - frmMain *frmMainPtrGet = static_cast(frmMainPtr); + bool ExitLoop = false; - vCard34Conv vCard34Obj; + while (ExitLoop == false){ - wxString ServerContactData; - vCard ClientData; - vCard ConvertedV4Data; - - // Load the client data from the filename given. - - CardDAVIter->second->GetServerContactData(); - ServerContactData = CardDAVIter->second->GetPageData(); + if (ConnObjectIter->second->SSLVerify() == COSSL_UNABLETOVERIFY){ + + frmMainPtrGet->PauseAllTimers(); + +#if defined(__APPLE__) +#elif defined(__WIN32__) +#else + + bool UsingSSLBypass = false; + int SSLResult = 0; + + // Connect again and fetch SSL certificate information. + + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false); + + ConnObjectIter->second->BypassSSLVerification(false); + + SSLInvalidCertNotifObjString SSLICNProcData; + + SSLCertCollectionString certcol = ConnObjectIter->second->BuildSSLCollection(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERTSTRING); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the Certificate. + + UsingSSLBypass = true; + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult TestConnectionResult = ConnObjectIter->second->Connect(true); + WriteServerCertificate(AccountDir, certcol); + + ConnObjectIter->second->BypassSSLVerification(false); + + } else if (SSLResult == 2){ - // Process v3 version into v4 version. + // Reject the certificate, abort the task and mark as failed. + + iter->second = 2; + break; + + } + +#endif + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = true; + + } else if (ConnectResponse == COCONNECT_AUTHFAIL){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + if (ConnectResponse == COCONNECT_OK){ + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } + + } else if (ConnectResponse == COCONNECT_OK){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } - vCard34Obj.ConvertToV4(&ServerContactData, &ConvertedV4Data); + } - vCardConflictObj vCardProcData; + if (iter->second == 2 || iter->second == 3 || iter->second == 4){ + break; + } - vCardProcData.vCardLocalData = &ClientData; - vCardProcData.vCardServerData = &ConvertedV4Data; - ClientData.LoadFile(FullFilename); +#if defined(__APPLE__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); - //ContactConflictEvent event(ContactConflictCmdEnv); - //event.SetData(ContactFilename, Moo1, Moo2); +#elif defined(__WIN32__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + +#else - //wxPostEvent(frmMainPtrGet, event); + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData()); - // Setup Conflict Resolution Dialog. +#endif - // Fetch Data from Server and convert. + COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(StringURLIter->second.ToStdString(), + StringDataIter->second.ToStdString()); - bool *PauseMode = new bool; - int ConflictResult; - QRNotif qrn; - - *PauseMode = TRUE; - qrn.QResponse = &ConflictResult; - qrn.PausePtr = PauseMode; - - vCardProcData.QRNotifData = &qrn; + if (AddContactResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED); - event.SetClientData(&vCardProcData); - wxPostEvent(frmMainPtrGet, event); + /*while (ExitLoop == FALSE){ - /*timespec n1, n2; + // Verify that we have a trusted SSL connection first. - n1.tv_sec = 0; - n1.tv_nsec = 250000000L;*/ - - while (*PauseMode == TRUE){ - //nanosleep(&n1, &n2); - SleepFor(250000000); + int ErrorCode = ConnHandle.SSLVerifyTest(); + + if (ErrorCode != CURLE_OK){ + + if (ErrorCode == CURLE_SSL_CACERT || + ErrorCode == CURLE_PEER_FAILED_VERIFICATION || + ErrorCode == CURLE_SSL_CONNECT_ERROR){ + + // Invalid SSL certificate so bring up a dialog to the user + // explaining what has happened and the options available. + + // Stop all the timers. + + frmMainPtrGet->PauseAllTimers(); + + int SSLResult; + +#if defined(__APPLE__) + + // Bring up the trust panel and display the SSL certificate dialog. + + SSLResult = DisplayTrustPanel(ConnHandle.GetTrustObject(), AccountNameFriendly); + + // Update the SSL account with the trust object. + + if (SSLResult != NSOKButton){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetTrustObject()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + + + } + +#elif defined(__WIN32__) + + BOOL ModifiedCertificateData; + CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(&ConnHandle, (HWND)frmMainPtrGet->GetHandle()); + + if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)){ + wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog")); + } + + if (ModifiedCertificateData == FALSE){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateContextPointer()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + + } + +#else + + // Setup the data to be sent in the wxPostEvent command. + + SSLInvalidCertNotifObj SSLICNProcData; + + SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERT); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the certificate. Write the certificate into the account + // directory (as server.crt) - will overwrite old certificate. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData()); + WriteServerCertificate(AccountDir, ConnHandle.GetCertificateData()); + + } else if (SSLResult == 2){ + + // Reject the certificate, abort the task and mark as failed. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateData()); + iter->second = 2; + break; + + } + +#endif + + // Resume all the timers. + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = TRUE; + + } else { + + iter->second = 2; + break; + + } + + } else { + + ExitLoop = TRUE; + } + + } - delete PauseMode; - PauseMode = NULL; + if (iter->second == 2 || iter->second == 3 || iter->second == 4){ + break; + } - //intResult = frmMainPtrGet->ShowConflictDialog(&Moo1, &Moo2); +#if defined(__APPLE__) - if (ConflictResult == 0){ + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + +#elif defined(__WIN32__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + +#else - // Decide Later. + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData()); - iter->second = 4; - continue; +#endif + + ConnHandle.SetUploadMode(TRUE); + ConnHandle.SetupData(wxT("PUT"), StringURLIter->second, StringDataIter->second); + ConnHandle.SetEditMode(EditMode); + ConnHandle.ProcessData(); + + int ErrorCode = ConnHandle.GetResultCode(); + + if (ErrorCode != CURLE_OK){ + + iter->second = 4; + break; + + } + + // Add contact to the ETag DB. + + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult();*/ + + // TODO: Get the entity tag for the new contact. + + COServerResponse ETagGetResponse = ConnObjectIter->second->GetServerEntityTagValue(StringURLIter->second.ToStdString()); + + if (ETagGetResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } + + std::cout << ETagGetResponse.EntityTag << std::endl; + + ETagDBPtr->UpdateETag(ContactFilename, ETagGetResponse.EntityTag, ETagGetResponse.EntityTag); + + iter->second = 4; + break; + + } + + } else if (TypeIter->second == 1){ + + // Update a contact. + + StringDataIter = ActivityListData.find(iter->first); + StringURLIter = ActivityListURL.find(iter->first); + + AccountDir = StringAccountIter->second; + ContactFilename = StringFilenameIter->second; + wxString AccountNameFriendly; + + int AccountID = 0; + + for (int i = 0; i < PrefData.accounts.GetCount(); i++){ + + wxString AccountDirCheck = PrefData.accounts.GetAccountDirectory(i); + + AccountDirCheck.Trim(); + AccountDirCheck.Append(wxT(".carddav")); + + if (AccountDirCheck == StringAccountIter->second){ + + AccountNameFriendly = PrefData.accounts.GetAccountName(i); + AccountID = i; + + } + + } + + ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); + + ETag = StringETagIter->second; + ETagOriginal = StringETagOrigIter->second; + AccountDir = StringAccountIter->second; + ContactFilename = StringFilenameIter->second; + FullFilename = StringFullFilenameIter->second; + EditMode = ActivityListEditMode.find(iter->first)->second; + + bool KeepUpdating = true; + + while(KeepUpdating == true){ + + COConnectResult ConnectResponse = ConnObjectIter->second->Connect(false); + + bool ExitLoop = false; + + while(ExitLoop == false){ + + if (ConnObjectIter->second->SSLVerify() == COSSL_UNABLETOVERIFY){ + + frmMainPtrGet->PauseAllTimers(); + +#if defined(__APPLE__) +#elif defined(__WIN32__) +#else + + bool UsingSSLBypass = false; + int SSLResult = 0; + + // Connect again and fetch SSL certificate information. + + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false); + + ConnObjectIter->second->BypassSSLVerification(false); + + SSLInvalidCertNotifObjString SSLICNProcData; + + SSLCertCollectionString certcol = ConnObjectIter->second->BuildSSLCollection(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERTSTRING); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the Certificate. + + UsingSSLBypass = true; + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult TestConnectionResult = ConnObjectIter->second->Connect(true); + WriteServerCertificate(AccountDir, certcol); + + ConnObjectIter->second->BypassSSLVerification(false); + + } else if (SSLResult == 2){ + + // Reject the certificate, abort the task and mark as failed. + + iter->second = 2; + break; + + } + +#endif + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = true; + + } else if (ConnectResponse == COCONNECT_AUTHFAIL){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + if (ConnectResponse == COCONNECT_OK){ + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } + + } else if (ConnectResponse == COCONNECT_OK){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } + + } + + if (iter->second == 2 || iter->second == 3 || iter->second == 4){ + break; + } + + COServerResponse ETagGetResponse = ConnObjectIter->second->GetServerEntityTagValue(StringURLIter->second.ToStdString()); + + if (ETagGetResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } + + ETagServer = ETagGetResponse.EntityTag; + + // Compare the ETag with the Server ETag. + + if (ETagOriginal != ETagServer){ + + // Server ETag is different from original ETag. + // This is a conflict which the user will now + // need to resolve. + + frmMain *frmMainPtrGet = static_cast(frmMainPtr); + + vCard34Conv vCard34Obj; + + std::string ServerContactData; + wxString wxStringServerContactData; + vCard ClientData; + vCard ConvertedV4Data; + + // Load the client data from the filename given. + + //ConnHandle.GetServerContactData(); + //ServerContactData = ConnHandle.GetPageData(); + + COServerResponse GetContactResponse = ConnObjectIter->second->GetContact(StringURLIter->second.ToStdString(), + &ServerContactData); + + if (GetContactResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } + + wxStringServerContactData = wxString::FromUTF8((const char*)ServerContactData.c_str()); + + // Process v3 version into v4 version. + + vCard34Obj.ConvertToV4(&wxStringServerContactData, &ConvertedV4Data); + + vCardConflictObj vCardProcData; + + vCardProcData.vCardLocalData = &ClientData; + vCardProcData.vCardServerData = &ConvertedV4Data; + ClientData.LoadFile(FullFilename); + + // Setup Conflict Resolution Dialog. + + // Fetch Data from Server and convert. + + bool *PauseMode = new bool; + int ConflictResult; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &ConflictResult; + qrn.PausePtr = PauseMode; + + vCardProcData.QRNotifData = &qrn; + + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED); + event.SetClientData(&vCardProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + SleepFor(250000000); + } + + delete PauseMode; + PauseMode = NULL; + + if (ConflictResult == 0){ + + // Decide Later. + + iter->second = 4; + break; + + } else if (ConflictResult == 1){ + + // Decided to use client version. + + } else if (ConflictResult == 2){ + + // Decided to use server version. + + // Download server version. + + ConvertedV4Data.WriteFile(FullFilename); + + } + + } else { + + // Upload the data to the server. + + COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(StringURLIter->second.ToStdString(), + StringDataIter->second.ToStdString()); + + if (EditContactResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } + + } + + /*while (ExitLoop == FALSE){ + + int ErrorCode = ConnHandle.SSLVerifyTest(); + + if (ErrorCode != CURLE_OK){ + + if (ErrorCode == CURLE_SSL_CACERT || + ErrorCode == CURLE_PEER_FAILED_VERIFICATION || + ErrorCode == CURLE_SSL_CONNECT_ERROR){ + + // Invalid SSL certificate so bring up a dialog to the user + // explaining what has happened and the options available. + + // Stop all the timers. + + frmMainPtrGet->PauseAllTimers(); + + int SSLResult; + +#if defined(__APPLE__) + + // Bring up the trust panel and display the SSL certificate dialog. + + SSLResult = DisplayTrustPanel(ConnHandle.GetTrustObject(), AccountNameFriendly); + + // Update the SSL account with the trust object. + + if (SSLResult != NSOKButton){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetTrustObject()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + + } + +#elif defined(__WIN32__) + + BOOL ModifiedCertificateData; + CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(&ConnHandle, (HWND)frmMainPtrGet->GetHandle()); + + if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)){ + wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog")); + } + + if (ModifiedCertificateData == FALSE){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateContextPointer()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + + } + +#else + + // Setup the data to be sent in the wxPostEvent command. + + SSLInvalidCertNotifObj SSLICNProcData; + + SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERT); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the certificate. Write the certificate into the account + // directory (as server.crt) - will overwrite old certificate. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults()); + + } else if (SSLResult == 2){ + + // Reject the certificate, abort the task and mark as failed. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults()); + iter->second = 2; + break; + + } + +#endif + + // Resume all the timers. + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = TRUE; + + } else { + + iter->second = 2; + break; + + } + + } else { + + ExitLoop = TRUE; + + } + + } - } else if (ConflictResult == 1){ + if (iter->second == 2 || iter->second == 3 || iter->second == 4){ + break; + } - // Decided to use client version. +#if defined(__APPLE__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + +#elif defined(__WIN32__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + +#else + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + +#endif + + ConnHandle.SetUploadMode(TRUE); + ConnHandle.SetupData(wxT("PUT"), StringURLIter->second, StringDataIter->second); + ConnHandle.SetEditMode(EditMode); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); + + int ErrorCode = ConnHandle.GetResultCode(); + + if (ErrorCode != CURLE_OK){ + iter->second = 2; + break; + } + + // Compare the ETag with the Server ETag. - CardDAVIter->second->ProcessData(); + if (ETagOriginal != ETagServer){ + + // Server ETag is different from original ETag. + // This is a conflict which the user will now + // need to resolve. + + vCard Moo1; + vCard Moo2; + + frmMain *frmMainPtrGet = static_cast(frmMainPtr); + + vCard34Conv vCard34Obj; + + wxString ServerContactData; + vCard ClientData; + vCard ConvertedV4Data; + + // Load the client data from the filename given. + + ConnHandle.GetServerContactData(); + ServerContactData = ConnHandle.GetPageData(); + + // Process v3 version into v4 version. + + vCard34Obj.ConvertToV4(&ServerContactData, &ConvertedV4Data); + + vCardConflictObj vCardProcData; + + vCardProcData.vCardLocalData = &ClientData; + vCardProcData.vCardServerData = &ConvertedV4Data; + ClientData.LoadFile(FullFilename); + + //ContactConflictEvent event(ContactConflictCmdEnv); + //event.SetData(ContactFilename, Moo1, Moo2); + + //wxPostEvent(frmMainPtrGet, event); + + // Setup Conflict Resolution Dialog. + + // Fetch Data from Server and convert. + + bool *PauseMode = new bool; + int ConflictResult; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &ConflictResult; + qrn.PausePtr = PauseMode; + + vCardProcData.QRNotifData = &qrn; + + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED); + event.SetClientData(&vCardProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + delete PauseMode; + PauseMode = NULL; + + //intResult = frmMainPtrGet->ShowConflictDialog(&Moo1, &Moo2); + if (ConflictResult == 0){ + + // Decide Later. + iter->second = 4; - + break; + + } else if (ConflictResult == 1){ + + // Decided to use client version. + + //ConnHandle.ProcessData(); + } else if (ConflictResult == 2){ - + // Decided to use server version. + + // Download server version. + + ConvertedV4Data.WriteFile(FullFilename); + + } + + } else { + + // Update the data to the server. + + ConnHandle.ProcessData(); + + }*/ + + // Update the ETag DB. + + //ConnHandle.GetServerETagValueThread(); + //ETagServer = ConnHandle.ETagValueResult(); + + ETagGetResponse = ConnObjectIter->second->GetServerEntityTagValue(StringURLIter->second.ToStdString()); + + if (ETagGetResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; + } + + ETagDBPtr->UpdateETag(ContactFilename, ETagGetResponse.EntityTag, ETagGetResponse.EntityTag); + + iter->second = 4; + break; + + } + + } else if (TypeIter->second == 2) { + + // Delete the contact from the server and update the ETag DB. + + AccountDir = StringAccountIter->second; + ContactFilename = StringFilenameIter->second; + wxString AccountNameFriendly; + + int AccountID = 0; + + for (int i = 0; i < PrefData.accounts.GetCount(); i++){ + + wxString AccountDirCheck = PrefData.accounts.GetAccountDirectory(i); + + AccountDirCheck.Trim(); + AccountDirCheck.Append(wxT(".carddav")); + + if (AccountDirCheck == StringAccountIter->second){ + + AccountNameFriendly = PrefData.accounts.GetAccountName(i); + AccountID = i; + + } + + } + + ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); + + bool KeepUpdating = TRUE; + + while(KeepUpdating == TRUE){ + + COConnectResult ConnectResponse = ConnObjectIter->second->Connect(false); + + bool ExitLoop = FALSE; + + while (ExitLoop == FALSE){ + + if (ConnObjectIter->second->SSLVerify() == COSSL_UNABLETOVERIFY){ + + frmMainPtrGet->PauseAllTimers(); + +#if defined(__APPLE__) +#elif defined(__WIN32__) +#else + + bool UsingSSLBypass = false; + int SSLResult = 0; + + // Connect again and fetch SSL certificate information. + + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false); + + ConnObjectIter->second->BypassSSLVerification(false); + + SSLInvalidCertNotifObjString SSLICNProcData; + + SSLCertCollectionString certcol = ConnObjectIter->second->BuildSSLCollection(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERTSTRING); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the Certificate. + + UsingSSLBypass = true; + ConnObjectIter->second->BypassSSLVerification(true); + + COConnectResult TestConnectionResult = ConnObjectIter->second->Connect(true); + WriteServerCertificate(AccountDir, certcol); + + ConnObjectIter->second->BypassSSLVerification(false); + + } else if (SSLResult == 2){ + + // Reject the certificate, abort the task and mark as failed. + + iter->second = 2; + break; + + } + +#endif + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = true; + + } else if (ConnectResponse == COCONNECT_AUTHFAIL){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + if (ConnectResponse == COCONNECT_OK){ + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } + + } else if (ConnectResponse == COCONNECT_OK){ + + ConnectResponse = ConnObjectIter->second->Connect(true); + + ExitLoop = true; + break; + + } else { + + ExitLoop = true; + iter->second = 2; + break; + + } + + /*int ErrorCode = ConnHandle.SSLVerifyTest(); + + if (ErrorCode != CURLE_OK){ + + if (ErrorCode == CURLE_SSL_CACERT || + ErrorCode == CURLE_PEER_FAILED_VERIFICATION || + ErrorCode == CURLE_SSL_CONNECT_ERROR){ + + // Invalid SSL certificate so bring up a dialog to the user + // explaining what has happened and the options available. + + // Stop all the timers. + + frmMainPtrGet->PauseAllTimers(); + + int SSLResult; + +#if defined(__APPLE__) + + // Bring up the trust panel and display the SSL certificate dialog. + + SSLResult = DisplayTrustPanel(ConnHandle.GetTrustObject(), AccountNameFriendly); + + // Update the SSL account with the trust object. + + if (SSLResult != NSOKButton){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetTrustObject()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + + } + +#elif defined(__WIN32__) + + BOOL ModifiedCertificateData; + CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(&ConnHandle, (HWND)frmMainPtrGet->GetHandle()); + + if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)){ + wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog")); + } + + if (ModifiedCertificateData == FALSE){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateContextPointer()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + + } + +#else + + // Setup the data to be sent in the wxPostEvent command. + + SSLInvalidCertNotifObj SSLICNProcData; + + SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults(); + + bool *PauseMode = new bool; + QRNotif qrn; + + *PauseMode = TRUE; + qrn.QResponse = &SSLResult; + qrn.PausePtr = PauseMode; + + SSLICNProcData.CertCollection = certcol; + SSLICNProcData.QRNotifData = &qrn; + SSLICNProcData.AccountName = AccountNameFriendly; + + wxCommandEvent event(INVALIDSSLCERT); + event.SetClientData(&SSLICNProcData); + wxPostEvent(frmMainPtrGet, event); + + while (*PauseMode == TRUE){ + //nanosleep(&n1, &n2); + SleepFor(250000000); + } + + // Process the response from the user. + + if (SSLResult == 1){ + + // Accept the certificate. Write the certificate into the account + // directory (as server.crt) - will overwrite old certificate. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults()); + + } else if (SSLResult == 2){ + + // Reject the certificate, abort the task and mark as failed. + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults()); + iter->second = 2; + break; + + } + +#endif + + // Resume all the timers. + + frmMainPtrGet->ResumeAllTimers(); + ExitLoop = TRUE; + + } else { + + iter->second = 4; + break; + + } - // Download server version. + } else { - ConvertedV4Data.WriteFile(FullFilename); + ExitLoop = TRUE; - iter->second = 4; + }*/ - } - - } else { - - // Update the data to the server. - - CardDAVIter->second->ProcessData(); + } + if (iter->second == 2 || iter->second == 3 || iter->second == 4){ + break; } - /*} else { - - if (ETagOriginal != ETagServer){ +#if defined(__APPLE__) - // Server ETag is different from original ETag. - // This is a conflict which the user will now - // need to resolve. - - frmMain *frmMainPtrGet = (frmMain *)frmMainPtr; - - //ContactConflictEvent event(ContactConflictCmdEnv); - //event.SetData(ContactFilename, Moo1, Moo2); - - vCard34Conv vCard34Obj; - - wxString ServerContactData; - vCard ClientData; - vCard ConvertedV4Data; - - // Load the client data from the filename given. - - CardDAVIter->second->GetServerContactData(); - ServerContactData = CardDAVIter->second->GetPageData(); - ClientData.LoadFile(FullFilename); - - // Process v3 version into v4 version. - - vCard34Obj.ConvertToV4(&ServerContactData, &ConvertedV4Data); - - vCardConflictObj vCardProcData; - - vCardProcData.vCardLocalData = &ClientData; - vCardProcData.vCardServerData = &ConvertedV4Data; - - bool *PauseMode = new bool; - int ConflictResult; - QRNotif qrn; + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); - *PauseMode = TRUE; - qrn.QResponse = &ConflictResult; - qrn.PausePtr = PauseMode; - - vCardProcData.QRNotifData = &qrn; - - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED); - event.SetClientData(&vCardProcData); - wxPostEvent(frmMainPtrGet, event); - - while (*PauseMode == TRUE){ - //nanosleep(&n1, &n2); - SleepFor(250000000); - } - - delete PauseMode; - PauseMode = NULL; +#elif defined(__WIN32__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + +#else - //intResult = frmMainPtrGet->ShowConflictDialog(&Moo1, &Moo2); - - if (ConflictResult == 0){ - - // Decide Later. - - iter->second = 4; - continue; - - } else if (ConflictResult == 1){ - - // Decided to use client version. - - CardDAVIter->second->ProcessData(); - //ETagServer = CardDAVIter->second.GetServerETagValueThread(); - //ETagDBPtr->UpdateETag(ContactFilename, ETagServer, ETagServer); - - iter->second = 4; - - } else if (ConflictResult == 2){ + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + +#endif + + /*ConnHandle.SetUploadMode(FALSE); + ConnHandle.SetupData(wxT("DELETE"), ContactFilename, wxT("")); + ConnHandle.ProcessData(); - // Decided to use server version. - - // Write server version to file. - - ConvertedV4Data.WriteFile(FullFilename); - - iter->second = 4; + SSLCertCollection certcol = ConnHandle.GetCertificateData(); + + // Check if any errors have occured whilst getting the data. + + int ErrorCode = ConnHandle.GetResultCode(); + + if (ErrorCode != CURLE_OK){ + iter->second = 2; + break; + }*/ - } - - } else { - - // Update the data to the server. + COServerResponse DeleteContactResponse = ConnObjectIter->second->DeleteContact(ContactFilename.ToStdString()); - CardDAVIter->second->ProcessData(); - + if (DeleteContactResponse.RequestResult != COREQUEST_OK){ + iter->second = 2; + break; } - - }*/ - - // Update the ETag DB. - - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); - ETagDBPtr->UpdateETag(ContactFilename, ETagServer, ETagServer); - - iter->second = 4; - CardDAVIter->second = NULL; - - } else if (TypeIter->second == 2) { - - // Delete the contact from the server and update the ETag DB. - AccountDir = StringAccountIter->second; - ContactFilename = StringFilenameIter->second; - - ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); + ETagDBPtr->RemoveETag(ContactFilename); - CardDAVIter->second->SetUploadMode(FALSE); - CardDAVIter->second->SetupData(wxT("DELETE"), ContactFilename, wxT("")); - //CardDAVIter->second.SetServerFilename(); - CardDAVIter->second->ProcessData(); - ETagDBPtr->RemoveETag(ContactFilename); + iter->second = 4; + //CardDAVIter->second = NULL; + break; - iter->second = 4; - CardDAVIter->second = NULL; + } } else if (TypeIter->second == 3) { - - frmMain *frmMainPtrGet = static_cast(frmMainPtr); wxString AccountNameFriendly; - wxString PrefFilename = GetUserPrefDir(); - XABPreferences PrefData(PrefFilename); int AccountID = 0; for (int i = 0; i < PrefData.accounts.GetCount(); i++){ @@ -603,21 +1617,16 @@ void frmActivityMgr::ProcessTasksThread() std::map *SCListData = NULL; while (ExitLoop == FALSE){ - - ServerContactList = CardDAVIter->second->GetContactList(SyncTokenLoad.ToUTF8()); - SSLCertCollection certcol = CardDAVIter->second->GetCertificateData(); - - // Create a pointer for the std::map. - - SCListData = &ServerContactList.ListData; // Check if any errors have occured whilst getting the data. - int ErrorCode = CardDAVIter->second->GetResultCode(); + int ErrorCode = ConnHandle.SSLVerifyTest(); - if (ErrorCode != 0){ + if (ErrorCode != CURLE_OK){ - if (ErrorCode == 60 || ErrorCode == 51){ + if (ErrorCode == CURLE_SSL_CACERT || + ErrorCode == CURLE_PEER_FAILED_VERIFICATION || + ErrorCode == CURLE_SSL_CONNECT_ERROR){ // Invalid SSL certificate so bring up a dialog to the user // explaining what has happened and the options available. @@ -626,12 +1635,57 @@ void frmActivityMgr::ProcessTasksThread() frmMainPtrGet->PauseAllTimers(); + int SSLResult; + +#if defined(__APPLE__) + + // Bring up the trust panel and display the SSL certificate dialog. + + SSLResult = DisplayTrustPanel(ConnHandle.GetTrustObject(), AccountNameFriendly); + + // Update the SSL account with the trust object. + + if (SSLResult != NSOKButton){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetTrustObject()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + + } + +#elif defined(__WIN32__) + + BOOL ModifiedCertificateData; + CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(&ConnHandle, (HWND)frmMainPtrGet->GetHandle()); + + if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)){ + wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog")); + } + + if (ModifiedCertificateData == FALSE){ + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateContextPointer()); + iter->second = 2; + break; + + } else { + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + + } +#else + // Setup the data to be sent in the wxPostEvent command. SSLInvalidCertNotifObj SSLICNProcData; + SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults(); + bool *PauseMode = new bool; - int SSLResult; QRNotif qrn; *PauseMode = TRUE; @@ -665,22 +1719,25 @@ void frmActivityMgr::ProcessTasksThread() // Accept the certificate. Write the certificate into the account // directory (as server.crt) - will overwrite old certificate. - frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, CardDAVIter->second->GetCertificateData()); - WriteServerCertificate(AccountDir, CardDAVIter->second->GetCertificateData()); + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults()); } else if (SSLResult == 2){ // Reject the certificate, abort the task and mark as failed. - frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, CardDAVIter->second->GetCertificateData()); + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults()); iter->second = 2; break; } + +#endif // Resume all the timers. frmMainPtrGet->ResumeAllTimers(); + ExitLoop = TRUE; } else { @@ -701,8 +1758,20 @@ void frmActivityMgr::ProcessTasksThread() break; } - frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, CardDAVIter->second->GetCertificateData()); - +#if defined(__APPLE__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject()); + +#elif defined(__WIN32__) + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateContextPointer()); + +#else + + frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults()); + +#endif + // Look in directory and see which vCards to add and delete // In short: @@ -716,6 +1785,23 @@ void frmActivityMgr::ProcessTasksThread() bool ContinueProcess = AccDir.GetFirst(&AccDirFilename, wxEmptyString, wxDIR_DEFAULT); + ServerContactList = ConnHandle.GetContactList(SyncTokenLoad.ToUTF8()); + + int ErrorCode = ConnHandle.GetResultCode(); + + if (ErrorCode != CURLE_OK){ + + iter->second = 4; + break; + + } + + SSLCertCollection certcol = ConnHandle.GetCertificateData(); + + // Create a pointer for the std::map. + + SCListData = &ServerContactList.ListData; + // Process the server data. if (SCListData != NULL){ @@ -793,6 +1879,15 @@ void frmActivityMgr::ProcessTasksThread() wxString ETagSrv = fsd.ETagData; + // Check if the local ETag value has 'DELETED' set and skip + // checking this file if it does. + + if (etd.ETagValue == "DELETED"){ + + continue; + + } + // Compare local ETag with original local ETag. // If different, update to server is required. @@ -814,9 +1909,9 @@ void frmActivityMgr::ProcessTasksThread() // Get the server contact data for comparison. - CardDAVIter->second->SetServerFilename(srviter->first); - CardDAVIter->second->GetServerContactData(); - ServerContactData = CardDAVIter->second->GetPageData(); + ConnHandle.SetServerFilename(srviter->first); + ConnHandle.GetServerContactData(); + ServerContactData = ConnHandle.GetPageData(); FullFilename = CreateFilenamePath(AccountDirFinal, srviter->first); @@ -950,9 +2045,9 @@ void frmActivityMgr::ProcessTasksThread() vCard34Conv vCard34Obj; - CardDAVIter->second->SetServerFilename(additer->first); - CardDAVIter->second->GetServerContactData(); - vCardInputData = CardDAVIter->second->GetPageData(); + ConnHandle.SetServerFilename(additer->first); + ConnHandle.GetServerContactData(); + vCardInputData = ConnHandle.GetPageData(); vCard34Obj.ConvertToV4(&vCardInputData, &ConvertedV4Data); @@ -972,8 +2067,8 @@ void frmActivityMgr::ProcessTasksThread() // Get the server ETag. wxString ServerETag; - CardDAVIter->second->GetServerETagValueThread(); - ServerETag = CardDAVIter->second->ETagValueResult(); + ConnHandle.GetServerETagValueThread(); + ServerETag = ConnHandle.ETagValueResult(); // Add to the ETag Database. @@ -998,8 +2093,8 @@ void frmActivityMgr::ProcessTasksThread() // Update the ETagDB. wxString ServerETag; - CardDAVIter->second->GetServerETagValueThread(); - ServerETag = CardDAVIter->second->ETagValueResult(); + ConnHandle.GetServerETagValueThread(); + ServerETag = ConnHandle.ETagValueResult(); // Add to the ETag Database. @@ -1063,9 +2158,9 @@ void frmActivityMgr::ProcessTasksThread() // Compare the ETag with the Server ETag. - CardDAVIter->second->SetServerFilename(vCardAdd[vi]); - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); + ConnHandle.SetServerFilename(vCardAdd[vi]); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); if (ETagOriginal != ETagServer){ @@ -1083,8 +2178,8 @@ void frmActivityMgr::ProcessTasksThread() // Load the client data from the filename given. - CardDAVIter->second->GetServerContactData(); - ServerContactData = CardDAVIter->second->GetPageData(); + ConnHandle.GetServerContactData(); + ServerContactData = ConnHandle.GetPageData(); // Process v3 version into v4 version. @@ -1145,7 +2240,7 @@ void frmActivityMgr::ProcessTasksThread() // Decided to use client version. - CardDAVIter->second->ProcessData(); + ConnHandle.ProcessData(); iter->second = 4; @@ -1194,15 +2289,15 @@ void frmActivityMgr::ProcessTasksThread() // Upload the data to the server. - CardDAVIter->second->SetUploadMode(TRUE); - CardDAVIter->second->SetupData(wxT("PUT"), vCardAdd[vi], TaskData); - CardDAVIter->second->ProcessData(); + ConnHandle.SetUploadMode(TRUE); + ConnHandle.SetupData(wxT("PUT"), vCardAdd[vi], TaskData); + ConnHandle.ProcessData(); // Get the Server ETag and put it in the ETag database. - CardDAVIter->second->SetServerFilename(vCardAdd[vi]); - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); + ConnHandle.SetServerFilename(vCardAdd[vi]); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); ETagDBPtr->AddETag(vCardAdd[vi], ETagServer, ETagServer); @@ -1229,8 +2324,8 @@ void frmActivityMgr::ProcessTasksThread() // Load the client data from the filename given. - CardDAVIter->second->GetServerContactData(); - ServerContactData = CardDAVIter->second->GetPageData(); + ConnHandle.GetServerContactData(); + ServerContactData = ConnHandle.GetPageData(); ClientData.LoadFile(FullFilename); // Process v3 version into v4 version. @@ -1282,7 +2377,7 @@ void frmActivityMgr::ProcessTasksThread() // Decided to use client version. - CardDAVIter->second->ProcessData(); + ConnHandle.ProcessData(); //ETagServer = CardDAVIter->second.GetServerETagValueThread(); //ETagDBPtr->UpdateETag(ContactFilename, ETagServer, ETagServer); @@ -1333,15 +2428,15 @@ void frmActivityMgr::ProcessTasksThread() // Upload the data to the server. - CardDAVIter->second->SetUploadMode(TRUE); - CardDAVIter->second->SetupData(wxT("PUT"), vCardAdd[vi], TaskData); - CardDAVIter->second->ProcessData(); + ConnHandle.SetUploadMode(TRUE); + ConnHandle.SetupData(wxT("PUT"), vCardAdd[vi], TaskData); + ConnHandle.ProcessData(); // Get the Server ETag and put it in the ETag database. - CardDAVIter->second->SetServerFilename(vCardAdd[vi]); - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); + ConnHandle.SetServerFilename(vCardAdd[vi]); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); ETagDBPtr->AddETag(vCardAdd[vi], ETagServer, ETagServer); @@ -1369,7 +2464,7 @@ void frmActivityMgr::ProcessTasksThread() // Process the vCards to delete from the server. std::map *ETagFilenameMap = ETagDBPtr->GetFilenamePointer(); - + std::list DeleteList; for (std::map::iterator deliter = ETagFilenameMap->begin(); deliter != ETagFilenameMap->end(); deliter++){ @@ -1378,17 +2473,24 @@ void frmActivityMgr::ProcessTasksThread() if (deliter->second == wxT("DELETED")){ - CardDAVIter->second->SetUploadMode(FALSE); - CardDAVIter->second->SetupData(wxT("DELETE"), deliter->first, wxT("")); - CardDAVIter->second->ProcessData(); + ConnHandle.SetUploadMode(FALSE); + ConnHandle.SetupData(wxT("DELETE"), deliter->first, wxT("")); + ConnHandle.ProcessDataThread(); // Delete the ETag as the file has now been deleted. - ETagDBPtr->RemoveETag(deliter->first); + DeleteList.push_back(deliter->first); } } + + for (std::list::iterator removeetagiter = DeleteList.begin(); + removeetagiter != DeleteList.end(); removeetagiter++){ + + ETagDBPtr->RemoveETag(*removeetagiter); + + } // Write out the update server sync token. @@ -1438,7 +2540,7 @@ void frmActivityMgr::ProcessTasksThread() // Update the data to the server. - CardDAVIter->second->ProcessData(); + ConnHandle.ProcessData(); iter->second = 4; continue; @@ -1451,19 +2553,19 @@ void frmActivityMgr::ProcessTasksThread() while (iter->second == 1){ - SleepFor(250000000); + SleepFor(125000000); //nanosleep(&n1, &n2); } - if ((iter->second == 4 && TypeIter->second == 0) || + /*if ((iter->second == 4 && TypeIter->second == 0) || (iter->second == 8 && TypeIter->second == 0)){ AccountDir = StringAccountIter->second; ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); ETagDBPtr->UpdateETag(ContactFilename, ETagServer, ETagServer); } @@ -1474,11 +2576,11 @@ void frmActivityMgr::ProcessTasksThread() AccountDir = StringAccountIter->second; ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); - CardDAVIter->second->GetServerETagValueThread(); - ETagServer = CardDAVIter->second->ETagValueResult(); + ConnHandle.GetServerETagValueThread(); + ETagServer = ConnHandle.ETagValueResult(); ETagDBPtr->UpdateETag(ContactFilename, ETagServer, ETagServer); - } + }*/ break; @@ -1500,7 +2602,7 @@ void frmActivityMgr::ProcessTasksThread() //ActListProcTimer.Start(); } - + wxCommandEvent event(ACTMGR_STARTPROCESSTIMER); wxPostEvent(this, event); @@ -1510,7 +2612,7 @@ void frmActivityMgr::ProcessTasksThread() void frmActivityMgr::ProcessTasks() { - + std::thread ProcessThread(&frmActivityMgr::ProcessTasksThread, this); ProcessThread.detach(); @@ -1541,15 +2643,23 @@ void frmActivityMgr::ToggleConnectionStatus( wxCommandEvent &event ){ wxCommandEvent connevent(CONNSTAT_UPDATE); - if (SleepMode == FALSE){ + if (ApplicationSleepMode == FALSE){ connevent.SetInt(1); - SleepMode = TRUE; + ApplicationSleepMode = TRUE; + mnuSleepMode->Check(true); } else { connevent.SetInt(0); - SleepMode = FALSE; + ApplicationSleepMode = FALSE; + mnuSleepMode->Check(false); + + wxCommandEvent event(ACTMGR_STARTTIMER); + wxPostEvent(this, event); + + wxCommandEvent eventp(ACTMGR_STARTPROCESSTIMER); + wxPostEvent(this, eventp); } @@ -1557,6 +2667,14 @@ void frmActivityMgr::ToggleConnectionStatus( wxCommandEvent &event ){ } +void frmActivityMgr::SleepMode( wxCommandEvent &event ){ + + wxCommandEvent connevent(ACTMGR_TOGGLECONN); + + wxPostEvent(this, connevent); + +} + void frmActivityMgr::WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc){ wxString ServerCertFinal; @@ -1577,6 +2695,26 @@ void frmActivityMgr::WriteServerCertificate(wxString AccountName, SSLCertCollect } +void frmActivityMgr::WriteServerCertificate(wxString AccountName, SSLCertCollectionString SSLCertInc){ + + wxString ServerCertFinal; + + // Get the Cert section of the certificate and write it to the file. + + ServerCertFinal = GetAccountDir(AccountName, TRUE); + + wxFile CertFile; + + std::map::iterator SSLCDIter = SSLCertInc.SSLCollection.find(0); + std::multimap::iterator SSLDataIter = SSLCDIter->second.CertData.find("Cert"); + + CertFile.Open(ServerCertFinal, wxFile::write); + + CertFile.Write(SSLDataIter->second, wxConvUTF8); + CertFile.Close(); + +} + void frmActivityMgr::StartTimer(wxCommandEvent& event){ ActListProcTimer.Start(1000, FALSE); @@ -1601,6 +2739,12 @@ void frmActivityMgr::StopProcessTimer(wxCommandEvent& event){ } +void frmActivityMgr::StartAnimationTimer(wxCommandEvent& event){ + + AnimationTimer.StartAnimation(); + +} + void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){ ActivityMgrLabelUpdate *actmgrudata = (ActivityMgrLabelUpdate*)event.GetClientData(); @@ -1618,6 +2762,4 @@ void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){ } -} - -#endif \ No newline at end of file +} \ No newline at end of file