Fix Facebook login

[situare] / src / situareservice / situareservice.cpp

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 82e61bb..2b7128d 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -174,11 +174,6 @@ void SituareService::fetchMessages()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-//    //Request sent to server does not need the UID
-//    QByteArray arr = m_database->getNotifications(613374451);
-
-//    parseMessagesData(arr);
-
     buildRequest(GET_MESSAGES, QHash<QString, QString>());
 }
 
@@ -226,6 +221,10 @@ SituareService::RequestName SituareService::getRequestName(const QUrl &url) cons
         return SituareService::RequestReverseGeo;
     else if (url.toString().contains(GET_MESSAGES))
         return SituareService::RequestGetMessages;
+    else if (url.toString().contains(REMOVE_MESSAGE))
+        return SituareService::RequestRemoveMessage;
+    else if (url.toString().contains(SEND_MESSAGE))
+        return SituareService::RequestSendMessage;
     else
         return SituareService::RequestUnknown;
 }
@@ -347,10 +346,14 @@ void SituareService::parseReply(const QByteArray &jsonReply, RequestName request
                 parseUserData(resultData);
             else if (requestName == SituareService::RequestUpdateLocation)
                 emit updateWasSuccessful(SituareService::SuccessfulUpdateLocation);
+            else if (requestName == SituareService::RequestRemoveMessage)
+                emit updateWasSuccessful(SituareService::SuccessfulRemoveMessage);
             else if (requestName == SituareService::RequestReverseGeo)
                 parseReverseGeoData(resultData);
             else if (requestName == SituareService::RequestGetMessages)
                 parseMessagesData(resultData);
+            else if (requestName == SituareService::RequestSendMessage)
+                emit updateWasSuccessful((SituareService::SuccessfulSendMessage));
         }
     }
 }
@@ -557,7 +560,7 @@ void SituareService::parseMessagesData(const QVariant &messagesData)
 
         received.append(message);
 
-        emit fetchImage(message.id(), messageMap["image_url"].toString());
+        //emit fetchImage(message.id(), messageMap["image_url"].toString());
     }
 
     foreach (QVariant messageVariant, result["sent"].toList()) {
@@ -619,8 +622,10 @@ void SituareService::removeMessage(const QString &id)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (m_database->removeMessage(613374451, id))
-        emit updateWasSuccessful(SituareService::SuccessfulRemoveMessage);
+    QHash<QString, QString> parameters;
+    parameters.insert("mid", id);
+
+    buildRequest(REMOVE_MESSAGE, parameters);
 }