From 0acc48076d8b2148d60d8a2532753c1eb06de276 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 26 Jan 2015 20:54:25 +0000 Subject: fix for sending messages git-svn-id: http://svn.miranda-ng.org/main/trunk@11919 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/WhatsAPI++/WAConnection.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'protocols/WhatsApp/src/WhatsAPI++/WAConnection.h') diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h index 91164a824f..bbdad6c0e6 100644 --- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h +++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h @@ -365,10 +365,15 @@ private: std::map pending_server_requests; IMutex *mutex; + void parseAck(ProtocolTreeNode *node) throw (WAException); + void parseChatStates(ProtocolTreeNode *node) throw (WAException); + void parseIq(ProtocolTreeNode *node) throw(WAException); + void parseMessage(ProtocolTreeNode* node) throw(WAException); + void parsePresense(ProtocolTreeNode*) throw(WAException); + std::map parseCategories(ProtocolTreeNode* node) throw(WAException); + void sendMessageWithMedia(FMessage* message) throw(WAException); void sendMessageWithBody(FMessage* message) throw(WAException); - std::map* parseCategories(ProtocolTreeNode* node) throw(WAException); - void parseMessageInitialTagAlreadyChecked(ProtocolTreeNode* node) throw(WAException); ProtocolTreeNode* getReceiptAck(const std::string& to, const std::string& id, const std::string& receiptType) throw(WAException); std::string makeId(const std::string& prefix); void sendGetGroups(const std::string& id, const std::string& type) throw (WAException); @@ -391,6 +396,8 @@ public: std::string jid; std::string nick; + KeyStream inputKey, outputKey; + int msg_id; bool retry; bool supports_receipt_acks; @@ -403,16 +410,15 @@ public: void logData(const char *format, ...); - static MessageStore* message_store; - KeyStream inputKey, outputKey; - static std::string removeResourceFromJid(const std::string& jid); - void setLogin(WALogin* login); + void setLogin(WALogin *login); void setVerboseId(bool b); void sendMessage(FMessage* message) throw(WAException); void sendAvailableForChat() throw(WAException); + bool read() throw(WAException); + void sendPing() throw(WAException); void sendQueryLastOnline(const std::string& jid) throw (WAException); void sendPong(const std::string& id) throw(WAException); @@ -422,8 +428,6 @@ public: void sendPaused(const std::string& to) throw(WAException); void sendSubjectReceived(const std::string& to, const std::string& id) throw(WAException); void sendMessageReceived(FMessage* message) throw(WAException); - void sendDeliveredReceiptAck(const std::string& to, const std::string& id) throw(WAException); - void sendVisibleReceiptAck(const std::string& to, const std::string& id) throw (WAException); void sendPresenceSubscriptionRequest(const std::string& to) throw (WAException); void sendClientConfig(const std::string& sound, const std::string& pushID, bool preview, const std::string& platform) throw(WAException); void sendClientConfig(const std::string& pushID, bool preview, const std::string& platform, bool defaultSettings, bool groupSettings, const std::vector& groups) throw(WAException); -- cgit v1.2.3