From 7eb308deaca4c8057338e39f2a27ea5e5f1c5786 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 17 May 2023 20:55:00 +0300 Subject: fixes #3518 (SkypeWeb: filetransfers are broken) --- protocols/SkypeWeb/src/requests/files.h | 2 +- protocols/SkypeWeb/src/skype_files.cpp | 10 +++++++++- protocols/SkypeWeb/src/version.h | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'protocols/SkypeWeb') diff --git a/protocols/SkypeWeb/src/requests/files.h b/protocols/SkypeWeb/src/requests/files.h index 9d0047bf61..72c47b4788 100644 --- a/protocols/SkypeWeb/src/requests/files.h +++ b/protocols/SkypeWeb/src/requests/files.h @@ -9,7 +9,7 @@ struct ASMObjectCreateRequest : public AsyncHttpRequest pUserInfo = fup; AddHeader("Authorization", CMStringA(FORMAT, "skype_token %s", ppro->m_szApiToken.get())); - AddHeader("Content-Type", "text/json"); + AddHeader("Content-Type", "application/json"); AddHeader("X-Client-Version", "0/0.0.0.0"); CMStringA szContact(ppro->getId(fup->hContact)); diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp index a28cc9f860..358a337e90 100644 --- a/protocols/SkypeWeb/src/skype_files.cpp +++ b/protocols/SkypeWeb/src/skype_files.cpp @@ -104,7 +104,15 @@ void CSkypeProto::OnASMObjectUploaded(NETLIBHTTPREQUEST *response, AsyncHttpRequ tinyxml2::XMLPrinter printer(0, true); doc.Print(&printer); - PushRequest(new SendMessageRequest(getId(fup->hContact), time(NULL), printer.CStr(), "RichText/Media_GenericFile")); + + SendMessageParam *param = new SendMessageParam(); + param->hContact = fup->hContact; + Utils_GetRandom(¶m->hMessage, sizeof(param->hMessage)); + param->hMessage &= ~0x80000000; + + auto *pReq = new SendMessageRequest(getId(fup->hContact), time(NULL), printer.CStr(), "RichText/Media_GenericFile"); + pReq->pUserInfo = param; + PushRequest(pReq); ProtoBroadcastAck(fup->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)fup); delete fup; diff --git a/protocols/SkypeWeb/src/version.h b/protocols/SkypeWeb/src/version.h index 991de1af6d..3e45ec255f 100644 --- a/protocols/SkypeWeb/src/version.h +++ b/protocols/SkypeWeb/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 -#define __MINOR_VERSION 95 -#define __RELEASE_NUM 13 -#define __BUILD_NUM 3 +#define __MINOR_VERSION 96 +#define __RELEASE_NUM 3 +#define __BUILD_NUM 1 #include -- cgit v1.2.3