X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmActivityMgr.cpp;h=9f3ba7da39e4046ad5c8307ff583fc1201e5ad5b;hb=e0521275eee34ef6feb06612512c611bb3c3b518;hp=5638c708e3cc9a51af26da41233a94863067b5c1;hpb=d653acf6bf03a8a713701c5ade6b246e3b506883;p=xestiaab%2F.git

diff --git a/source/frmActivityMgr.cpp b/source/frmActivityMgr.cpp
index 5638c70..9f3ba7d 100644
--- a/source/frmActivityMgr.cpp
+++ b/source/frmActivityMgr.cpp
@@ -30,6 +30,7 @@ DEFINE_EVENT_TYPE(ACTMGR_STARTTIMER);
 DEFINE_EVENT_TYPE(ACTMGR_STOPTIMER);
 DEFINE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER);
 DEFINE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER);
+DEFINE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL);
 
 BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow)
   EVT_COMMAND(wxID_ANY, ACTMGR_RESUMEPROC, frmActivityMgr::ResumeProcessing)
@@ -38,6 +39,7 @@ BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow)
   EVT_COMMAND(wxID_ANY, ACTMGR_STOPTIMER, frmActivityMgr::StopTimer)
   EVT_COMMAND(wxID_ANY, ACTMGR_STARTPROCESSTIMER, frmActivityMgr::StartProcessTimer)
   EVT_COMMAND(wxID_ANY, ACTMGR_STOPPROCESSTIMER, frmActivityMgr::StopProcessTimer)
+  EVT_COMMAND(wxID_ANY, ACTMGR_UPDATESTATUSLABEL, frmActivityMgr::UpdateStatusLabel)
 END_EVENT_TABLE()
 
 frmActivityMgr::frmActivityMgr( wxWindow* parent )
@@ -286,7 +288,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		lstActivity->SetItem(itemindex, 1, AccountName);
 		lstActivity->SetItem(itemindex, 2, _("Queued"));
 		
-		// TODO: Pass the ETagDB for the account to the connection.
+		ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
 		
 		ActivityList.insert(std::make_pair(ActivityTaskID, 0));
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 2));
@@ -454,6 +456,12 @@ void frmActivityMgr::CloseWindow( wxCommandEvent& event )
 	this->Hide();
 }
 
+void frmActivityMgr::CloseWindow( wxCloseEvent& event )
+{
+	WindowOpen = FALSE;
+	this->Hide();
+}
+
 void frmActivityMgr::ProcessTasksThread()
 {
 	
@@ -636,7 +644,6 @@ void frmActivityMgr::ProcessTasksThread()
 						
 							ConvertedV4Data.WriteFile(FullFilename);
 						
-						
 							iter->second = 4;
 					
 						}
@@ -879,6 +886,7 @@ void frmActivityMgr::ProcessTasksThread()
 					
 						//ServerContactList = CardDAVInstance.GetContactList(SyncTokenLoad.ToUTF8());
 						ServerContactList = CardDAVIter->second.GetContactList(SyncTokenLoad.ToUTF8());
+						SSLCertCollection certcol = CardDAVIter->second.GetCertificateData();
 				
 						// Create a pointer for the std::map<wxString,FileSyncData>.
 				
@@ -911,7 +919,7 @@ void frmActivityMgr::ProcessTasksThread()
 								qrn.QResponse = &SSLResult;
 								qrn.PausePtr = PauseMode;
 								
-								SSLICNProcData.CertCollection = CardDAVIter->second.GetCertificateData();
+								SSLICNProcData.CertCollection = certcol;
 								SSLICNProcData.QRNotifData = &qrn;
 								SSLICNProcData.AccountName = AccountNameFriendly;
 							
@@ -1326,14 +1334,19 @@ void frmActivityMgr::ProcessTasksThread()
 						ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
 						ETag = ETagDBPtr->GetETag(vCardAdd[vi]);
 						ETagOriginal = ETagDBPtr->GetETagOriginal(vCardAdd[vi]);
+						
 						ContactFilename = vCardAdd[vi];
 						FullFilename = CreateFilenamePath(AccountDirFinal, vCardAdd[vi]);
 
 						ContactFilename.Trim();
 			
-						if (ETag == ETagOriginal){
+						if (ETag == ETagOriginal && ETagDBPtr->ETagExists(vCardAdd[vi])){
 			
 							// Compare the ETag with the Server ETag.
+						
+							CardDAVIter->second.SetServerFilename(vCardAdd[vi]);
+							CardDAVIter->second.GetServerETagValueThread();
+							ETagServer = CardDAVIter->second.ETagValueResult();
 				
 							if (ETagOriginal != ETagServer){
 				
@@ -1690,6 +1703,14 @@ void frmActivityMgr::ProcessTasksThread()
 				}
 				
 				// Mark as completed.
+			
+				wxString AccountNameFinal;
+				AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
+				AccountNameFinal.Append(wxT(".carddav"));
+				
+				wxCommandEvent reloadevent(RELOADCONTACTLIST);
+				reloadevent.SetString(AccountNameFinal);
+				wxPostEvent(this->GetParent(), reloadevent);
 				
 				iter->second = 4;
 				continue;
@@ -1699,6 +1720,8 @@ void frmActivityMgr::ProcessTasksThread()
 				// Update the data to the server.
 					
 				CardDAVIter->second.ProcessData();
+				iter->second = 4;
+				continue;
 			
 			}
 
@@ -1876,4 +1899,23 @@ void frmActivityMgr::StopProcessTimer(wxCommandEvent& event){
 
 }
 
+void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
+
+	ActivityMgrLabelUpdate *actmgrudata = (ActivityMgrLabelUpdate*)event.GetClientData();
+	
+	if (actmgrudata != NULL){
+	
+		lstActivity->SetItem(actmgrudata->ItemIndex, 2, actmgrudata->ItemLabel);
+	
+		/*if (!actmgrudata->ItemDes.IsEmpty()){
+		lstActivity->SetItem(actmgrudata->ItemIndex, 0, actmgrudata->ItemDes);
+		}*/
+	
+		delete actmgrudata;
+		actmgrudata = NULL;
+	
+	}
+
+}
+
 #endif
\ No newline at end of file