From 7e5994812b44a7190a661f17d250f0854bf901c8 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Mon, 1 Nov 2021 20:17:13 +0100 Subject: [PATCH] Removed redownload / cache --- main/buildserver.h | 7 ------- main/displays/menus/otamenu.h | 8 -------- main/displays/menus/selectbuildservermenu.h | 1 - 3 files changed, 16 deletions(-) diff --git a/main/buildserver.h b/main/buildserver.h index 5f1f8ca..ff14c57 100644 --- a/main/buildserver.h +++ b/main/buildserver.h @@ -25,7 +25,6 @@ namespace { bool request_running = false; uint16_t request_failed = false; bool parsing_finished = false; - static bool redownload = true; cpputils::DelayedConstruction request; std::string get_ota_url_from_index(uint16_t index) @@ -113,7 +112,6 @@ namespace { url_for_latest = fix_url(fmt::format("{}{}", stringSettings.otaServerUrl, doc["latest"].as())); url_for_hashes = fix_url(fmt::format("{}{}", stringSettings.otaServerUrl, doc["url"].as())); parsing_finished = true; - redownload = false; } void setup_request() @@ -124,11 +122,6 @@ namespace { void start_descriptor_request(std::string server_base_url) { - if (!redownload) - { - parsing_finished = true; - return; - } if (!request.constructed()) { ESP_LOGW("BOBBY", "request is im oarsch"); diff --git a/main/displays/menus/otamenu.h b/main/displays/menus/otamenu.h index f4bf45c..619bc00 100644 --- a/main/displays/menus/otamenu.h +++ b/main/displays/menus/otamenu.h @@ -24,13 +24,6 @@ using namespace espgui; namespace { -class RedownloadJsonAction : public virtual ActionInterface { -public: - void triggered() override { - redownload = true; - } -}; - class OtaMenu : public MenuDisplay, public StaticText, @@ -42,7 +35,6 @@ public: constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::presets>>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::update>>>(); constructMenuItem, SwitchScreenAction>>(); - constructMenuItem, RedownloadJsonAction>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } }; diff --git a/main/displays/menus/selectbuildservermenu.h b/main/displays/menus/selectbuildservermenu.h index 0caa71b..b19c91b 100644 --- a/main/displays/menus/selectbuildservermenu.h +++ b/main/displays/menus/selectbuildservermenu.h @@ -45,7 +45,6 @@ public: stringSettings.otaUrl = m_buildserver_url; } saveSettings(); - redownload = true; url_for_latest.clear(); url_for_hashes.clear(); availableVersions = {};