WhatsApp: fix for reading own keys

1 files changed, 15 insertions, 9 deletions

diff --git a/protocols/WhatsApp/src/wanode.cpp b/protocols/WhatsApp/src/wanode.cpp
index 8d5a2ef7f0..f48ceaebd9 100644
--- a/protocols/WhatsApp/src/wanode.cpp
+++ b/protocols/WhatsApp/src/wanode.cpp
@@ -576,17 +576,23 @@ void WAWriter::writeString(const char *str)
 
 	auto *pszDelimiter = strchr(str, '@');
 	if (pszDelimiter) {
-		writeByte(JID_PAIR);
+		WAJid jid(str);
+		if (jid.device || jid.agent) {
+			writeByte(AD_JID);
+			writeByte(jid.agent);
+			writeByte(jid.device);
+			writeString(jid.user);
+		}
+		else {
+			writeByte(JID_PAIR);
 
-		if (pszDelimiter == str) // empty jid
-			writeByte(LIST_EMPTY);
-		else
-			writeString(CMStringA(str, int(pszDelimiter - str)));
+			if (jid.user.IsEmpty()) // empty user
+				writeByte(LIST_EMPTY);
+			else
+				writeString(jid.user);
 
-		if (pszDelimiter[1] == 0) // empty jid
-			writeByte(LIST_EMPTY);
-		else
-			writeString(pszDelimiter + 1);
+			writeString(jid.server);
+		}
 	}
 	else {
 		CMStringA buf(str);