Fix Facebook login

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index aab43d4..db4f662 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -884,14 +884,15 @@ void SituareEngine::updateWasSuccessful(SituareService::SuccessfulMethod success
     qDebug() << __PRETTY_FUNCTION__;
 
     if (m_networkAccessManager->isConnected()) {
-        if (successfulMethod == SituareService::SuccessfulUpdateLocation)
+        if (successfulMethod == SituareService::SuccessfulUpdateLocation) {
             m_situareService->fetchLocations();
-        else  if ((successfulMethod == SituareService::SuccessfulRemoveMessage) ||
-                  (successfulMethod == SituareService::SuccessfulSendMessage))
+        } else  if ((successfulMethod == SituareService::SuccessfulRemoveMessage) ||
+                    (successfulMethod == SituareService::SuccessfulSendMessage)) {
             m_situareService->fetchMessages();
-        else if ((successfulMethod == SituareService::SuccessfulAddTags) ||
-                 (successfulMethod == SituareService::SuccessfulRemoveTags))
+        } else if ((successfulMethod == SituareService::SuccessfulAddTags) ||
+                   (successfulMethod == SituareService::SuccessfulRemoveTags)) {
             m_situareService->fetchLocations();
+        }
     } else {
         error(ErrorContext::NETWORK, QNetworkReply::UnknownNetworkError);
     }

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 8475f29..6c59d08 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -120,7 +120,7 @@ void FacebookAuthentication::login()
 
     if (m_browser) {
         QString url = FB_LOGIN_URL + "?";
-        url.append("api_key=" + API_KEY +"&");
+        url.append("api_key=" + APP_ID +"&");
         url.append("display=touch&");
         url.append("fbconnect=1&");
         url.append("next=" + FB_LOGIN_SUCCESS_URL + "&");
@@ -215,6 +215,7 @@ void FacebookAuthentication::urlChanged(const QUrl &url)
      */
 
     const QString urlString = url.toString();
+
     if (!urlString.contains(URL_SESSION_PARAMETER_BEGIN)) {
         // login page url doesn't contain session
         /// @todo INVOKE DIALOG ALSO WHEN STOPPED TO PERMISSION PAGE

diff --git a/src/situareservice/situarecommon.h b/src/situareservice/situarecommon.h
index 2af26c7..d4e4b5a 100644 (file)
--- a/src/situareservice/situarecommon.h
+++ b/src/situareservice/situarecommon.h
@@ -25,7 +25,7 @@
 #include <QString>
 
 // Situare server constants
-#ifndef USE_TEST_SERVER
+#ifdef USE_PRODUCTION_SERVER
     // Production server
     const QString SITUARE_URL = "http://client.situare.net/";
     const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81";
@@ -33,6 +33,7 @@
     // Test server
     const QString SITUARE_URL = "http://emmerichgn.facebook.joyent.us/";
     const QString API_KEY = "cf77865a5070f2c2ba3b52cbf3371579";
+    const QString APP_ID = "286811277465";
 #endif
 
 // Situare JSON callback data
@@ -43,6 +44,8 @@ const QString UPDATE_LOCATION = "updateLocation.php";
 const QString REVERSE_GEO = "reversegeo.php";
 const QString GET_LOCATIONS = "getLocations.php";
 const QString GET_MESSAGES = "getMessages.php";
+const QString SEND_MESSAGE = "sendMessage.php";
+const QString REMOVE_MESSAGE = "removeMessage.php";
 
 // Cookies
 const QString COOKIE = "Cookie";

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);
 }
 
 

diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index 7fee903..350884d 100644 (file)
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -57,7 +57,9 @@ private:
                        RequestGetLocations,
                        RequestUpdateLocation,
                        RequestReverseGeo,
-                       RequestGetMessages};
+                       RequestGetMessages,
+                       RequestRemoveMessage,
+                       RequestSendMessage};
 
 public: