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 a2168e2..be5f40a 100644 (file)
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -496,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;
@@ -821,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;
@@ -1706,8 +1706,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                                break;
                                                        }
                                                        
-                                                       // TODO: Continue from here!
-                                                       
                                                        ETagServer = wxString::FromUTF8(ServerEntityTag.EntityTag.c_str());
                                
                                                        if (ETagOriginal != ETagServer){
@@ -1783,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;
@@ -1832,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;
@@ -1925,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;
@@ -1974,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;