Skip to content

Commit 0c64f34

Browse files
committed
Issue witnessmenow#11: factored out code from sendMultipartFormDataToTelegram() to readHTTPAnswer()
1 parent e76e475 commit 0c64f34

File tree

1 file changed

+1
-38
lines changed

1 file changed

+1
-38
lines changed

src/UniversalTelegramBot.cpp

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ String UniversalTelegramBot::sendMultipartFormDataToTelegram(
215215

216216
String body;
217217
String headers;
218-
long now;
219-
bool responseReceived = false;
220-
bool finishedHeaders = false;
221-
bool currentLineIsBlank = true;
222218

223219
const String boundary = F("------------------------b8f610217e83e29b");
224220

@@ -319,40 +315,7 @@ String UniversalTelegramBot::sendMultipartFormDataToTelegram(
319315
#ifdef _debug
320316
Serial.print("End request: " + end_request);
321317
#endif
322-
int ch_count = 0;
323-
now = millis();
324-
325-
while (millis() - now < waitForResponse) {
326-
while (client->available()) {
327-
char c = client->read();
328-
responseReceived = true;
329-
330-
if (!finishedHeaders) {
331-
if (currentLineIsBlank && c == '\n') {
332-
finishedHeaders = true;
333-
} else {
334-
headers += c;
335-
}
336-
} else {
337-
if (ch_count < maxMessageLength) {
338-
body += c;
339-
ch_count++;
340-
}
341-
}
342-
343-
if (c == '\n') currentLineIsBlank = true;
344-
else if (c != '\r') currentLineIsBlank = false;
345-
}
346-
347-
if (responseReceived) {
348-
#ifdef _debug
349-
Serial.println();
350-
Serial.println(body);
351-
Serial.println();
352-
#endif
353-
break;
354-
}
355-
}
318+
readHTTPAnswer(body, headers);
356319
}
357320

358321
closeClient();

0 commit comments

Comments
 (0)