Skip to content

Allow passing custom HTTPClient to HTTPUpdate #4959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 18, 2021
Merged

Allow passing custom HTTPClient to HTTPUpdate #4959

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05e4ef5
Allow passing custom HTTPClient
MohammedNoureldin Mar 18, 2021
a86911d
Merge branch 'master' of https://github.com/MohammedNoureldin/arduino…
MohammedNoureldin Mar 18, 2021
7f05cb3
Remove WiFiClient when passing HTTPClient to HTTPUpdate
MohammedNoureldin Mar 18, 2021
600a67c
Remove redundant arguments from HTTPUpdate::update
MohammedNoureldin Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions libraries/HTTPUpdate/src/HTTPUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const
return handleUpdate(http, currentVersion, false);
}

HTTPUpdateResult HTTPUpdate::updateSpiffs(HTTPClient& httpClient, const String& url, const String& currentVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not need the url argument :)

{
return handleUpdate(httpClient, currentVersion, true);
}

HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion)
{
HTTPClient http;
Expand All @@ -68,6 +73,12 @@ HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url,
return handleUpdate(http, currentVersion, true);
}

HTTPUpdateResult HTTPUpdate::update(HTTPClient& httpClient, const String& host, uint16_t port, const String& uri,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not need the host, port and uri arguments :)

const String& currentVersion)
{
return handleUpdate(httpClient, currentVersion, false);
}

HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint16_t port, const String& uri,
const String& currentVersion)
{
Expand Down
4 changes: 4 additions & 0 deletions libraries/HTTPUpdate/src/HTTPUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ class HTTPUpdate

t_httpUpdate_return updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion = "");

t_httpUpdate_return update(HTTPClient& httpClient, const String& host, uint16_t port, const String& uri = "/",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not need the host, port and uri arguments :)

const String& currentVersion = "");

t_httpUpdate_return updateSpiffs(HTTPClient &httpClient, const String &url, const String &currentVersion = "");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not need the url argument :)


int getLastError(void);
String getLastErrorString(void);
Expand Down