[downloader] Updated downloading policy.

Added info about last auto retry download failed.
fijemax · Jun 23, 2016 · 990a620 · 990a620
1 parent 880c877
commit 990a620
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/storage/downloading_policy.cpp b/storage/downloading_policy.cpp
@@ -13,6 +13,7 @@ void StorageDownloadingPolicy::ScheduleRetry(storage::TCountriesSet const & fail
 {
   if (IsDownloadingAllowed() && !failedCountries.empty() && m_autoRetryCounter > 0)
   {
+    m_downloadRetryFailed = false;
     auto action = [this, func, failedCountries]
     {
       --m_autoRetryCounter;
@@ -22,6 +23,8 @@ void StorageDownloadingPolicy::ScheduleRetry(storage::TCountriesSet const & fail
   }
   else
   {
+    if(!failedCountries.empty())
+      m_downloadRetryFailed = true;
     m_autoRetryCounter = kAutoRetryCounterMax;
   }
 }
diff --git a/storage/downloading_policy.hpp b/storage/downloading_policy.hpp
@@ -18,6 +18,7 @@ class DownloadingPolicy
 class StorageDownloadingPolicy : public DownloadingPolicy
 {
   bool m_cellularDownloadEnabled = false;
+  bool m_downloadRetryFailed = false;
   static size_t constexpr kAutoRetryCounterMax = 3;
   size_t m_autoRetryCounter = kAutoRetryCounterMax;
   my::DeferredTask m_autoRetryWorker;
@@ -27,7 +28,7 @@ class StorageDownloadingPolicy : public DownloadingPolicy
 
   inline void EnableCellularDownload(bool value) { m_cellularDownloadEnabled = value; }
   inline bool IsCellularDownloadEnabled() const { return m_cellularDownloadEnabled; }
-  inline bool IsAutoRetryDownloadFailed() const { return m_autoRetryCounter == 0; }
+  inline bool IsAutoRetryDownloadFailed() const { return m_downloadRetryFailed || m_autoRetryCounter == 0; }
 
   bool IsDownloadingAllowed() const override;
   void ScheduleRetry(storage::TCountriesSet const & failedCountries, TProcessFunc const & func) override;