From 5cf35ef0f12fc51221c6d267999a39caf8bd8a73 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 30 Jan 2015 17:11:31 +0000
Subject: - fix for loosing image or video's caption - fix for processing
 incoming contacts

git-svn-id: http://svn.miranda-ng.org/main/trunk@11957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp | 38 +++++++++++++++-------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'protocols/WhatsApp/src/WhatsAPI++')

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
index 113d2c6bf3..c5ae37bb6b 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
@@ -303,7 +303,6 @@ void WAConnection::parseMessage(ProtocolTreeNode *messageNode) throw (WAExceptio
 	const string &id = messageNode->getAttributeValue("id");
 	const string &attribute_t = messageNode->getAttributeValue("t");
 	const string &from = messageNode->getAttributeValue("from");
-	const string &notify = messageNode->getAttributeValue("notify");
 	const string &author = messageNode->getAttributeValue("author");
 
 	const string &typeAttribute = messageNode->getAttributeValue("type");
@@ -348,7 +347,7 @@ void WAConnection::parseMessage(ProtocolTreeNode *messageNode) throw (WAExceptio
 		FMessage fmessage(from, false, id);
 		fmessage.wants_receipt = false;
 		fmessage.timestamp = atoi(attribute_t.c_str());
-		fmessage.notifyname = notify;
+		fmessage.notifyname = messageNode->getAttributeValue("notify");
 		fmessage.data = body->getDataAsString();
 		fmessage.status = FMessage::STATUS_UNSENT;
 		if (fmessage.timestamp == 0) {
@@ -363,13 +362,13 @@ void WAConnection::parseMessage(ProtocolTreeNode *messageNode) throw (WAExceptio
 			return;
 
 		ProtocolTreeNode *media = messageNode->getChild("media");
-		if (from.empty() || media == NULL || media->data == NULL || media->data->empty())
+		if (media == NULL)
 			return;
 
 		FMessage fmessage(from, false, id);
 		fmessage.wants_receipt = false;
 		fmessage.timestamp = atoi(attribute_t.c_str());
-		fmessage.notifyname = notify;
+		fmessage.data = messageNode->getAttributeValue("caption");
 		fmessage.remote_resource = author;
 		fmessage.media_wa_type = FMessage::getMessage_WA_Type(media->getAttributeValue("type"));
 		fmessage.media_url = media->getAttributeValue("url");
@@ -383,24 +382,41 @@ void WAConnection::parseMessage(ProtocolTreeNode *messageNode) throw (WAExceptio
 			if (latitudeString.empty() || longitudeString.empty())
 				throw WAException("location message missing lat or long attribute", WAException::CORRUPT_STREAM_EX, 0);
 
-			double latitude = atof(latitudeString.c_str());
-			double longitude = atof(longitudeString.c_str());
-			fmessage.latitude = latitude;
-			fmessage.longitude = longitude;
+			fmessage.latitude = atof(latitudeString.c_str());
+			fmessage.longitude = atof(longitudeString.c_str());
 		}
-
-		if (fmessage.media_wa_type == FMessage::WA_TYPE_CONTACT) {
+		else if (fmessage.media_wa_type == FMessage::WA_TYPE_CONTACT) {
 			ProtocolTreeNode *contactChildNode = media->getChild(0);
 			if (contactChildNode != NULL) {
 				fmessage.media_name = contactChildNode->getAttributeValue("name");
 				fmessage.data = contactChildNode->getDataAsString();
+				size_t off = fmessage.data.find("TEL;");
+				if (off != string::npos) {
+					if ((off = fmessage.data.find(":", off)) != string::npos) {
+						std::string number;
+						for (off++;; off++) {
+							char c = fmessage.data[off];
+							if (isdigit(c))
+								number += c;
+							else if (c == '+' || c == ' ')
+								continue;
+							else
+								break;
+						}
+						if (!number.empty())
+							fmessage.remote_resource = number;
+					}
+				}
 			}
 		}
 		else {
+			if (media->data == NULL || media->data->empty())
+				return;
+
 			const string &encoding = media->getAttributeValue("encoding");
 			if (encoding.empty() || encoding == "text")
 				fmessage.data = media->getDataAsString();
-			else {
+			else if (media->data->size() > 0) {
 				fmessage.bindata = (unsigned char*)malloc(fmessage.bindata_len = media->data->size());
 				memcpy(fmessage.bindata, media->data->data(), fmessage.bindata_len);
 			}
-- 
cgit v1.2.3