Refactors restore flow

Author: NejcZdovc

include/bat/ledger/ledger_client.h

@@ -46,6 +46,7 @@ using GetNicewareListCallback =
 using RecurringDonationCallback = std::function<void(const PublisherInfoList&)>;
 using RecurringRemoveCallback = std::function<void(Result)>;
 using FetchIconCallback = std::function<void(bool, const std::string&)>;
+using OnRestoreCallback = std::function<void(bool)>;
 
 class LEDGER_EXPORT LedgerClient {
  public:
@@ -141,6 +142,8 @@ class LEDGER_EXPORT LedgerClient {
 
   // Log debug information
   virtual void Log(ledger::LogLevel level, const std::string& text) = 0;
+
+  virtual void OnRestorePublishers(ledger::OnRestoreCallback callback) = 0;
 };
 
 }  // namespace ledger

src/bat_publishers.cc

@@ -368,28 +368,21 @@ void BatPublishers::onSetPanelExcludeInternal(ledger::PUBLISHER_EXCLUDE exclude,
   OnExcludedSitesChanged();
 }
 
-// TODO refactor
-void BatPublishers::restorePublishers() {
-  uint64_t currentReconcileStamp = ledger_->GetReconcileStamp();
-  auto filter = CreateActivityFilter("",
-      ledger::ACTIVITY_MONTH::ANY,
-      -1,
-      ledger::EXCLUDE_FILTER::FILTER_EXCLUDED,
-      false,
-      currentReconcileStamp);
-  ledger_->GetActivityInfoList(0, 0, filter, std::bind(&BatPublishers::onRestorePublishersInternal,
-                                this, _1, _2));
+void BatPublishers::RestorePublishers() {
+  ledger_->OnRestorePublishers(
+      std::bind(&BatPublishers::OnRestorePublishersInternal,
+                this,
+                _1));
 }
 
-void BatPublishers::onRestorePublishersInternal(const ledger::PublisherInfoList& publisherInfoList, uint32_t /* next_record */) {
-  if (publisherInfoList.size() == 0) {
-    return;
-  }
-
-  for (size_t i = 0; i < publisherInfoList.size(); i++) {
-    // Set to PUBLISHER_EXCLUDE::DEFAULT (0)
-    setExclude(publisherInfoList[i].id,
-               ledger::PUBLISHER_EXCLUDE::DEFAULT);
+void BatPublishers::OnRestorePublishersInternal(bool success) {
+  if (success) {
+    setNumExcludedSites(0);
+    OnExcludedSitesChanged();
+  } else {
+    ledger_->Log(__func__,
+                 ledger::LogLevel::LOG_ERROR,
+                 {"Could not restore publishers."});
   }
 }
 

src/bat_publishers.h

@@ -56,7 +56,7 @@ class BatPublishers : public ledger::LedgerCallbackHandler {
   void setPanelExclude(const std::string& publisher_id,
     const ledger::PUBLISHER_EXCLUDE& exclude, uint64_t windowId);
 
-  void restorePublishers();
+  void RestorePublishers();
 
   void setPublisherAllowNonVerified(const bool& allow);
   void setPublisherAllowVideos(const bool& allow);
@@ -168,7 +168,7 @@ class BatPublishers : public ledger::LedgerCallbackHandler {
     ledger::Result result,
     std::unique_ptr<ledger::PublisherInfo> publisher_info);
 
-  void onRestorePublishersInternal(const ledger::PublisherInfoList& publisherInfoList, uint32_t /* next_record */);
+  void OnRestorePublishersInternal(bool success);
 
   double concaveScore(const uint64_t& duration);
 

src/ledger_impl.cc

@@ -320,7 +320,11 @@ void LedgerImpl::SetPublisherPanelExclude(const std::string& publisher_id,
 }
 
 void LedgerImpl::RestorePublishers() {
-  bat_publishers_->restorePublishers();
+  bat_publishers_->RestorePublishers();
+}
+
+void LedgerImpl::OnRestorePublishers(ledger::OnRestoreCallback callback) {
+  ledger_client_->OnRestorePublishers(callback);
 }
 
 void LedgerImpl::LoadNicewareList(ledger::GetNicewareListCallback callback) {

src/ledger_impl.h

@@ -161,6 +161,7 @@ class LedgerImpl : public ledger::Ledger,
     const ledger::PUBLISHER_EXCLUDE& exclude, uint64_t windowId) override;
 
   void RestorePublishers() override;
+  void OnRestorePublishers(ledger::OnRestoreCallback callback);
   bool IsWalletCreated() const override;
   void GetPublisherActivityFromUrl(uint64_t windowId, const ledger::VisitData& visit_data) override;
   void GetMediaActivityFromUrl(uint64_t windowId,