X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.cpp;h=9c1e2a41514dbc8b96eba05e340529daf88ddacd;hb=ff65774611d82f2bdbb6cb5c34829cc2e922cf68;hp=e9c4469eed02db6f351c34bbe2575f6c9fc89300;hpb=928ccf2fd714100dd8ded320f53bb7bb192b850f;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index e9c4469..9c1e2a4 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -390,7 +390,7 @@ void frmActivityMgr::ProcessTasksThread()
 								
 								SSLInvalidCertNotifObj SSLICNProcData;
 								
-								SSLCertCollection certcol = ConnHandle.GetCertificateData();
+								SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
 								
 								bool *PauseMode = new bool;
 								QRNotif qrn;
@@ -614,7 +614,7 @@ void frmActivityMgr::ProcessTasksThread()
 								
 								SSLInvalidCertNotifObj SSLICNProcData;
 								
-								SSLCertCollection certcol = ConnHandle.GetCertificateData();
+								SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
 								
 								bool *PauseMode = new bool;
 								QRNotif qrn;
@@ -643,14 +643,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// 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());
+									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.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 									
@@ -692,7 +692,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
 					
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 					
 #endif
 					
@@ -918,6 +918,8 @@ void frmActivityMgr::ProcessTasksThread()
 								
 								SSLInvalidCertNotifObj SSLICNProcData;
 								
+								SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
+								
 								bool *PauseMode = new bool;
 								QRNotif qrn;
 								
@@ -952,14 +954,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// 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());
+									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.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 								
@@ -1001,13 +1003,14 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
 				
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 				
 #endif
 
 					ConnHandle.SetUploadMode(FALSE);
 					ConnHandle.SetupData(wxT("DELETE"), ContactFilename, wxT(""));
 					ConnHandle.ProcessData();
+					
 					SSLCertCollection certcol = ConnHandle.GetCertificateData();
 
 					// Check if any errors have occured whilst getting the data.
@@ -1187,6 +1190,8 @@ void frmActivityMgr::ProcessTasksThread()
 
 								SSLInvalidCertNotifObj SSLICNProcData;
 
+								SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
+
 								bool *PauseMode = new bool;
 								QRNotif qrn;
 
@@ -1221,14 +1226,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// 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());
+									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.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 								
@@ -1270,7 +1275,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
                                         
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 			
 #endif