Skip to content
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

Jump to bottom

Brave Ads no longer needs to fetch the catalog when the user becomes active or the browser enters the foreground #14116

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Brave Ads no longer needs to fetch the catalog when the user becomes active or the browser enters the foreground #14116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 1 addition & 22 deletions vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <utility>

#include "base/check_op.h"
#include "base/check.h"
#include "base/time/time.h"
#include "bat/ads/ads.h"
#include "bat/ads/internal/ads_client_helper.h"
Expand All @@ -19,14 +19,12 @@
#include "bat/ads/internal/base/time/time_formatting_util.h"
#include "bat/ads/internal/base/url/url_request_string_util.h"
#include "bat/ads/internal/base/url/url_response_string_util.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/catalog/catalog_constants.h"
#include "bat/ads/internal/catalog/catalog_info.h"
#include "bat/ads/internal/catalog/catalog_json_reader.h"
#include "bat/ads/internal/catalog/catalog_url_request_builder.h"
#include "bat/ads/internal/catalog/catalog_util.h"
#include "bat/ads/internal/database/database_manager.h"
#include "bat/ads/internal/user_interaction/idle_detection/idle_detection_manager.h"

namespace ads {

Expand All @@ -39,15 +37,11 @@ constexpr base::TimeDelta kDebugCatalogPing = base::Minutes(15);
} // namespace

Catalog::Catalog() {
BrowserManager::GetInstance()->AddObserver(this);
DatabaseManager::GetInstance()->AddObserver(this);
IdleDetectionManager::GetInstance()->AddObserver(this);
}

Catalog::~Catalog() {
BrowserManager::GetInstance()->RemoveObserver(this);
DatabaseManager::GetInstance()->RemoveObserver(this);
IdleDetectionManager::GetInstance()->RemoveObserver(this);
}

void Catalog::AddObserver(CatalogObserver* observer) {
Expand Down Expand Up @@ -182,24 +176,9 @@ void Catalog::NotifyFailedToUpdateCatalog() const {
}
}

void Catalog::OnBrowserDidEnterForeground() {
if (HasCatalogExpired()) {
MaybeFetch();
}
}

void Catalog::OnDidMigrateDatabase(const int from_version,
const int to_version) {
DCHECK_NE(from_version, to_version);

ResetCatalog();
}

void Catalog::OnUserDidBecomeActive(const base::TimeDelta idle_time,
const bool was_locked) {
if (HasCatalogExpired()) {
MaybeFetch();
}
}

} // namespace ads
13 changes: 1 addition & 12 deletions vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
#include "base/observer_list.h"
#include "bat/ads/internal/base/timer/backoff_timer.h"
#include "bat/ads/internal/base/timer/timer.h"
#include "bat/ads/internal/browser/browser_manager_observer.h"
#include "bat/ads/internal/catalog/catalog_observer.h"
#include "bat/ads/internal/database/database_manager_observer.h"
#include "bat/ads/internal/user_interaction/idle_detection/idle_detection_manager_observer.h"
#include "bat/ads/public/interfaces/ads.mojom.h"

namespace base {
Expand All @@ -23,9 +21,7 @@ namespace ads {

struct CatalogInfo;

class Catalog final : public BrowserManagerObserver,
public DatabaseManagerObserver,
public IdleDetectionManagerObserver {
class Catalog final : public DatabaseManagerObserver {
public:
Catalog();
Catalog(const Catalog&) = delete;
Expand All @@ -48,17 +44,10 @@ class Catalog final : public BrowserManagerObserver,
void NotifyDidUpdateCatalog(const CatalogInfo& catalog) const;
void NotifyFailedToUpdateCatalog() const;

// BrowserManagerObserver:
void OnBrowserDidEnterForeground() override;

// DatabaseManagerObserver:
void OnDidMigrateDatabase(const int from_version,
const int to_version) override;

// IdleDetectionManagerObserver:
void OnUserDidBecomeActive(const base::TimeDelta idle_time,
const bool was_locked) override;

base::ObserverList<CatalogObserver> observers_;

bool is_processing_ = false;
Expand Down
4 changes: 3 additions & 1 deletion vendor/bat-native-ads/src/bat/ads/internal/database/database_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <functional>
#include <utility>

#include "base/check.h"
#include "base/check_op.h"
#include "bat/ads/internal/ads_client_helper.h"
#include "bat/ads/internal/base/logging_util.h"
#include "bat/ads/internal/legacy_migration/database/database_constants.h"
Expand Down Expand Up @@ -157,6 +157,8 @@ void DatabaseManager::NotifyWillMigrateDatabase(const int from_version,

void DatabaseManager::NotifyDidMigrateDatabase(const int from_version,
const int to_version) const {
DCHECK_NE(from_version, to_version);

for (DatabaseManagerObserver& observer : observers_) {
observer.OnDidMigrateDatabase(from_version, to_version);
}
Expand Down