frmActivityMgr: UTF-8 support for adding/editing contacts implemented

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

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index 7232694..be5f40a 100644 (file)
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -330,6 +330,27 @@ void frmActivityMgr::ProcessTasksThread()
                                                        frmMainPtrGet->PauseAllTimers();
                                                        
 #if defined(__APPLE__)
+
+                                                       ConnObjectIter->second->BypassSSLVerification(true);
+                                                       
+                                                       COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(false);
+                                                       
+                                                       int SSLResult = DisplayTrustPanel(ConnObjectIter->second->BuildSSLCollection(), AccountNameFriendly);
+                                                       
+                                                       if (SSLResult != NSOKButton){
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+                                                               iter->second = 2;
+                                                               break;
+                                                               
+                                                       } else {
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+                                                               
+                                                       }
+                                                       
 #elif defined(__WIN32__)
 
                                                        ConnObjectIter->second->BypassSSLVerification(true);
@@ -462,7 +483,7 @@ void frmActivityMgr::ProcessTasksThread()
                                        
 #if defined(__APPLE__)
                                        
-                                       frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject());
+                                       frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
 
 #elif defined(__WIN32__)
 
@@ -475,7 +496,7 @@ void frmActivityMgr::ProcessTasksThread()
 #endif
                                        
                                        COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(StringURLIter->second.ToStdString(), 
-                                                       StringDataIter->second.ToStdString());
+                                                       std::string(StringDataIter->second.ToUTF8()));
                                        
                                        if (AddContactResponse.RequestResult != COREQUEST_OK){
                                                iter->second = 2;
@@ -491,8 +512,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                break;
                                        }
                                        
-                                       std::cout << ETagGetResponse.EntityTag << std::endl;
-                                       
                                        ETagDBPtr->UpdateETag(ContactFilename, ETagGetResponse.EntityTag, ETagGetResponse.EntityTag);
                                        
                                        iter->second = 4;
@@ -553,6 +572,27 @@ void frmActivityMgr::ProcessTasksThread()
                                                        frmMainPtrGet->PauseAllTimers();
                                                        
 #if defined(__APPLE__)
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(true);
+                                                       
+                                                       COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(false);
+                                                       
+                                                       int SSLResult = DisplayTrustPanel(ConnObjectIter->second->BuildSSLCollection(), AccountNameFriendly);
+                                                       
+                                                       if (SSLResult != NSOKButton){
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+                                                               iter->second = 2;
+                                                               break;
+                                                               
+                                                       } else {
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+                                                               
+                                                       }
+                                                       
 #elif defined(__WIN32__)
 
                                                        ConnObjectIter->second->BypassSSLVerification(true);
@@ -781,7 +821,7 @@ void frmActivityMgr::ProcessTasksThread()
                                                // Upload the data to the server.
                                                
                                                COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(StringURLIter->second.ToStdString(), 
-                                                       StringDataIter->second.ToStdString());
+                                                       std::string(StringDataIter->second.ToUTF8()));
                                        
                                                if (EditContactResponse.RequestResult != COREQUEST_OK){
                                                        iter->second = 2;
@@ -847,6 +887,27 @@ void frmActivityMgr::ProcessTasksThread()
                                                        frmMainPtrGet->PauseAllTimers();
                                                        
 #if defined(__APPLE__)
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(true);
+                                                       
+                                                       COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(false);
+                                                       
+                                                       int SSLResult = DisplayTrustPanel(ConnObjectIter->second->BuildSSLCollection(), AccountNameFriendly);
+                                                       
+                                                       if (SSLResult != NSOKButton){
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+                                                               iter->second = 2;
+                                                               break;
+                                                               
+                                                       } else {
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+                                                               
+                                                       }
+                                                       
 #elif defined(__WIN32__)
 
                                                        ConnObjectIter->second->BypassSSLVerification(true);
@@ -979,7 +1040,7 @@ void frmActivityMgr::ProcessTasksThread()
                        
 #if defined(__APPLE__)
                                
-                                       frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject());
+                                       frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
 
 #elif defined(__WIN32__)
 
@@ -1102,6 +1163,27 @@ void frmActivityMgr::ProcessTasksThread()
                                                        frmMainPtrGet->PauseAllTimers();
                                                        
 #if defined(__APPLE__)
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(true);
+                                                       
+                                                       COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+                                                       
+                                                       ConnObjectIter->second->BypassSSLVerification(false);
+                                                       
+                                                       int SSLResult = DisplayTrustPanel(ConnObjectIter->second->BuildSSLCollection(), AccountNameFriendly);
+                                                       
+                                                       if (SSLResult != NSOKButton){
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+                                                               iter->second = 2;
+                                                               break;
+                                                               
+                                                       } else {
+                                                               
+                                                               frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+                                                               
+                                                       }
+                                                       
 #elif defined(__WIN32__)
 
                                                        ConnObjectIter->second->BypassSSLVerification(true);
@@ -1215,6 +1297,19 @@ void frmActivityMgr::ProcessTasksThread()
                                                        
                                                        ConnectResponse = ConnObjectIter->second->Connect(true);
                                                        
+                                                       if (ConnectResponse == COCONNECT_OK){
+                                                               
+                                                               ExitLoop = true;
+                                                               break;
+                                                               
+                                                       } else {
+                                                               
+                                                               ExitLoop = true;
+                                                               iter->second = 2;
+                                                               break;
+                                                               
+                                                       }
+                                                       
                                                        ExitLoop = true;
                                                        break;
                                                        
@@ -1230,7 +1325,7 @@ void frmActivityMgr::ProcessTasksThread()
                                
 #if defined(__APPLE__)
                                         
-                                        frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetTrustObject());
+                                        frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
 
 #elif defined(__WIN32__)
 
@@ -1611,8 +1706,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                                break;
                                                        }
                                                        
-                                                       // TODO: Continue from here!
-                                                       
                                                        ETagServer = wxString::FromUTF8(ServerEntityTag.EntityTag.c_str());
                                
                                                        if (ETagOriginal != ETagServer){
@@ -1688,7 +1781,7 @@ void frmActivityMgr::ProcessTasksThread()
                                        
                                                                        // Decided to use client version.
                                        
-                                                                       COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), ClientData.WriteString().ToStdString());
+                                                                       COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), std::string(ClientData.WriteString().ToUTF8()));
                                                
                                                                        if (EditContactResponse.RequestResult != COREQUEST_OK){
                                                                                iter->second = 2;
@@ -1737,7 +1830,7 @@ void frmActivityMgr::ProcessTasksThread()
 
                                                                // Upload the data to the server.
                                                                
-                                                               COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), TaskData.ToStdString());
+                                                               COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), std::string(TaskData.ToUTF8()));
                                                        
                                                                if (AddContactResponse.RequestResult != COREQUEST_OK){
                                                                        iter->second = 2;
@@ -1830,7 +1923,7 @@ void frmActivityMgr::ProcessTasksThread()
                                        
                                                                        // Decided to use client version.
                                                                
-                                                                       COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), ClientData.WriteString().ToStdString());
+                                                                       COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), std::string(ClientData.WriteString().ToUTF8()));
 
                                                                        if (EditContactResponse.RequestResult != COREQUEST_OK){
                                                                                iter->second = 2;
@@ -1879,7 +1972,7 @@ void frmActivityMgr::ProcessTasksThread()
 
                                                                // Upload the data to the server.
                                                                
-                                                               COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), TaskData.ToStdString());
+                                                               COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), std::string(TaskData.ToUTF8()));
 
                                                                if (AddContactResponse.RequestResult != COREQUEST_OK){
                                                                        iter->second = 2;
@@ -2180,4 +2273,4 @@ void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
        
        }
 
-}
\ No newline at end of file
+}