From 730c132f369842cd219388905cf981c2e90f98b3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Jan 2024 12:11:16 +0300 Subject: code cleaning --- protocols/WhatsApp/src/avatars.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'protocols/WhatsApp/src') diff --git a/protocols/WhatsApp/src/avatars.cpp b/protocols/WhatsApp/src/avatars.cpp index 32e57706a4..f1b0709c34 100644 --- a/protocols/WhatsApp/src/avatars.cpp +++ b/protocols/WhatsApp/src/avatars.cpp @@ -135,7 +135,7 @@ bool CMPlugin::SaveFile(const char *pszUrl, PROTO_AVATAR_INFORMATION &ai) req.m_szUrl = pszUrl; req.nlc = hAvatarConn; - NLHR_PTR pReply(Netlib_HttpTransaction(hAvatarUser, &req)); + NLHR_PTR pReply(Netlib_DownloadFile(hAvatarUser, &req, ai.filename)); if (pReply == nullptr) { hAvatarConn = nullptr; debugLogA("Failed to retrieve avatar from url: %s", pszUrl); @@ -144,23 +144,10 @@ bool CMPlugin::SaveFile(const char *pszUrl, PROTO_AVATAR_INFORMATION &ai) hAvatarConn = pReply->nlc; - bool bSuccess = false; - if (pReply->resultCode == 200 && !pReply->body.IsEmpty()) { - if (auto *pszHdr = pReply->FindHeader("Content-Type")) - ai.format = ProtoGetAvatarFormatByMimeType(pszHdr); - - if (ai.format != PA_FORMAT_UNKNOWN) { - FILE *fout = _wfopen(ai.filename, L"wb"); - if (fout) { - fwrite(pReply->body, 1, pReply->body.GetLength(), fout); - fclose(fout); - bSuccess = true; - } - else debugLogA("Error saving avatar to file %S", ai.filename); - } - else debugLogA("unknown avatar mime type"); + if (pReply->resultCode != 200) { + debugLogA("Error %d reading avatar from url: %s", pReply->resultCode, pszUrl); + return false; } - else debugLogA("Error %d reading avatar from url: %s", pReply->resultCode, pszUrl); - return bSuccess; + return true; } -- cgit v1.2.3