diff options
author | Thomas Amland <thomas.amland@gmail.com> | 2017-02-12 14:46:24 +0100 |
---|---|---|
committer | Thomas Amland <thomas.amland@gmail.com> | 2017-02-19 12:27:08 +0100 |
commit | d1ae78e9999fa80e312fa2c0fb4157117f3067a8 (patch) | |
tree | 9e8efbba18c5cf4d269f24ca3faa4249b61b5443 | |
parent | 8715f937635929f38d2cc98a51eedc844845328a (diff) |
[addons] remove non-functioning broken status code
-rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 1 | ||||
-rw-r--r-- | xbmc/addons/Repository.cpp | 43 |
2 files changed, 0 insertions, 44 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 467345343b..c8dddc1522 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -14361,7 +14361,6 @@ msgctxt "#24095" msgid "Local package cache" msgstr "" -#: xbmc/addons/Repository.cpp #: addons/skin.estuary/1080i/DialogAddonInfo.xml msgctxt "#24096" msgid "Add-on is incompatible or has been marked broken in repository." diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp index e64a3665c1..ce1e8ab7ed 100644 --- a/xbmc/addons/Repository.cpp +++ b/xbmc/addons/Repository.cpp @@ -257,48 +257,5 @@ bool CRepositoryUpdateJob::DoWork() } database.UpdateRepositoryContent(m_repo->ID(), m_repo->Version(), newChecksum, addons); - - //Notify about broken status changes - for (const auto& addon : addons) - { - AddonPtr localAddon; - if (!CAddonMgr::GetInstance().GetAddon(addon->ID(), localAddon)) - continue; - - if (localAddon && localAddon->Version() > addon->Version()) - //We have a newer version locally - continue; - - AddonPtr oldAddon; - database.GetAddon(addon->ID(), oldAddon); - - if (database.GetAddonVersion(addon->ID()).first > addon->Version()) - //Newer version in db (ie. in a different repo) - continue; - - std::string broken = addon->Broken(); - bool isBroken = !addon->Broken().empty(); - bool isBrokenInDb = oldAddon && !oldAddon->Broken().empty(); - if (isBroken && !isBrokenInDb) - { - //newly broken - if (HELPERS::ShowYesNoDialogLines(CVariant{addon->Name()}, CVariant{24096}, CVariant{24097}, CVariant{""}) - == DialogResponse::YES) - { - CAddonMgr::GetInstance().DisableAddon(addon->ID()); - } - - CLog::Log(LOGDEBUG, "CRepositoryUpdateJob[%s] addon '%s' marked broken. reason: \"%s\"", - m_repo->ID().c_str(), addon->ID().c_str(), broken.c_str()); - - CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(addon, 24096))); - } - else if (!isBroken && isBrokenInDb) - { - //Unbroken - CLog::Log(LOGDEBUG, "CRepositoryUpdateJob[%s] addon '%s' unbroken", - m_repo->ID().c_str(), addon->ID().c_str()); - } - } return true; } |