Improved syncronisation (stop conflict resolution screen appearing everytime after...

[xestiaab/.git] / source / frmActivityMgr.cpp

diff --git a/source/frmActivityMgr.cpp b/source/frmActivityMgr.cpp
index 39274fd..f7b2f95 100644 (file)
--- 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 )
@@ -45,8 +47,6 @@ frmActivityMgr::frmActivityMgr( wxWindow* parent )
 frmActivityMgrADT( parent )
 {
 
-       frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
-
        wxMemoryInputStream istream(icons_activitywindow_png, sizeof(icons_activitywindow_png));
        wxImage icons_activitywindow_pngi(istream, wxBITMAP_TYPE_PNG);
        wxBitmap activityiconbmp(icons_activitywindow_pngi, -1);
@@ -354,7 +354,7 @@ void frmActivityMgr::StopTask( wxCommandEvent& event ){
                wxLIST_NEXT_ALL,
                wxLIST_STATE_SELECTED);
 
-       intSelectedData = lstActivity->GetItemData(longSelected);
+       intSelectedData = (int)lstActivity->GetItemData(longSelected);
        
        if (longSelected == -1){
                return;
@@ -383,7 +383,7 @@ void frmActivityMgr::StopAllTasks( wxCommandEvent& event ){
                wxLIST_NEXT_ALL,
                wxLIST_STATE_SELECTED);
 
-       intSelectedData = lstActivity->GetItemData(longSelected);
+       intSelectedData = (int)lstActivity->GetItemData(longSelected);
        
        if (longSelected == -1){
                return;
@@ -413,7 +413,7 @@ void frmActivityMgr::RetryTask( wxCommandEvent& event ){
                wxLIST_NEXT_ALL,
                wxLIST_STATE_SELECTED);
 
-       intSelectedData = lstActivity->GetItemData(longSelected);
+       intSelectedData = (int)lstActivity->GetItemData(longSelected);
        
        if (longSelected == -1){
                return;
@@ -456,6 +456,12 @@ void frmActivityMgr::CloseWindow( wxCommandEvent& event )
        this->Hide();
 }
 
+void frmActivityMgr::CloseWindow( wxCloseEvent& event )
+{
+       WindowOpen = FALSE;
+       this->Hide();
+}
+
 void frmActivityMgr::ProcessTasksThread()
 {
        
@@ -553,7 +559,6 @@ void frmActivityMgr::ProcessTasksThread()
                                        
                                                vCard Moo1;
                                                vCard Moo2;
-                                               int intResult;
                                        
                                                frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
                                        
@@ -660,10 +665,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                // This is a conflict which the user will now
                                                // need to resolve.
                                        
-                                               vCard Moo1;
-                                               vCard Moo2;
-                                               int intResult;
-                                       
                                                frmMain *frmMainPtrGet = (frmMain *)frmMainPtr;
                                        
                                                //ContactConflictEvent event(ContactConflictCmdEnv);
@@ -886,6 +887,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>.
                                
@@ -918,7 +920,7 @@ void frmActivityMgr::ProcessTasksThread()
                                                                qrn.QResponse = &SSLResult;
                                                                qrn.PausePtr = PauseMode;
                                                                
-                                                               SSLICNProcData.CertCollection = CardDAVIter->second.GetCertificateData();
+                                                               SSLICNProcData.CertCollection = certcol;
                                                                SSLICNProcData.QRNotifData = &qrn;
                                                                SSLICNProcData.AccountName = AccountNameFriendly;
                                                        
@@ -1209,7 +1211,6 @@ void frmActivityMgr::ProcessTasksThread()
                                        wxString vCardInputData;
                                        wxString ETagFileData;
                                        wxFFile vCardFile;
-                                       bool vCardProcessError;
                                
                                        for (std::map<wxString,vCardDownloadDataFileClass>::iterator additer = vCardDownloadData.begin();
                                                additer != vCardDownloadData.end(); additer++){
@@ -1334,24 +1335,25 @@ 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){
                                
                                                                // Server ETag is different from original ETag.
                                                                // This is a conflict which the user will now
                                                                // need to resolve.
-                               
-                                                               vCard Moo1;
-                                                               vCard Moo2;
-                                                               int intResult;
                                        
                                                                frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
                                        
@@ -1495,10 +1497,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                                // Server ETag is different from original ETag.
                                                                // This is a conflict which the user will now
                                                                // need to resolve.
-                                                                               
-                                                               vCard Moo1;
-                                                               vCard Moo2;
-                                                               int intResult;
                                        
                                                                frmMain *frmMainPtrGet = (frmMain *)frmMainPtr;
                                        
@@ -1647,8 +1645,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                        ETagDBPtr->RemoveETag(vCardDelete[vi]);
                                        
                                                }
-                                       
-                                               frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
 
                                        }
                                
@@ -1894,4 +1890,27 @@ void frmActivityMgr::StopProcessTimer(wxCommandEvent& event){
 
 }
 
+void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
+
+       ActivityMgrLabelUpdate *actmgrudata = (ActivityMgrLabelUpdate*)event.GetClientData();
+       
+       if (actmgrudata != NULL){
+       
+       wxPuts(wxT("ItemIndex:") + actmgrudata->ItemIndex);
+       wxPuts(wxT("ItemLabel:") + actmgrudata->ItemLabel);
+       wxPuts(wxT("ItemDes:  ") + actmgrudata->ItemDes);
+       
+       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