From 18237a2ab4ee6eff18b425a303569b29695dc47f Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Tue, 26 Feb 2019 17:01:13 +0100 Subject: [PATCH 1/3] Simplifies include/exclude logic Resolves https://github.com/brave/brave-browser/issues/3480 --- browser/extensions/api/brave_rewards_api.cc | 2 +- common/extensions/api/brave_rewards.json | 4 -- .../brave_rewards/browser/rewards_service.h | 2 +- .../browser/rewards_service_impl.cc | 14 +++-- .../browser/rewards_service_impl.h | 3 +- .../actions/rewards_panel_actions.ts | 5 +- .../reducers/rewards_panel_reducer.ts | 4 +- .../brave_rewards/components/panel.tsx | 2 +- components/definitions/chromel.d.ts | 2 +- .../bat_ledger_client_mojo_proxy.cc | 9 ---- .../bat_ledger/bat_ledger_client_mojo_proxy.h | 3 -- .../services/bat_ledger/bat_ledger_impl.cc | 6 --- .../services/bat_ledger/bat_ledger_impl.h | 2 - .../public/cpp/ledger_client_mojo_proxy.cc | 6 --- .../public/cpp/ledger_client_mojo_proxy.h | 3 -- .../public/interfaces/bat_ledger.mojom | 5 -- .../include/bat/ledger/ledger.h | 5 -- .../include/bat/ledger/ledger_client.h | 4 -- .../bat-native-ledger/src/bat_publishers.cc | 53 +------------------ vendor/bat-native-ledger/src/bat_publishers.h | 6 --- vendor/bat-native-ledger/src/ledger_impl.cc | 7 --- vendor/bat-native-ledger/src/ledger_impl.h | 5 -- 22 files changed, 19 insertions(+), 133 deletions(-) diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index 3d21563925b6..b50605d44499 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -89,7 +89,7 @@ ExtensionFunction::ResponseAction RewardsServiceFactory::GetForProfile(profile); if (rewards_service) { rewards_service->SetContributionAutoInclude( - params->publisher_key, params->excluded, params->window_id); + params->publisher_key, params->excluded); } return RespondNow(NoArguments()); } diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json index d60b68cc6405..b44ace0d99ea 100644 --- a/common/extensions/api/brave_rewards.json +++ b/common/extensions/api/brave_rewards.json @@ -337,10 +337,6 @@ { "name": "excluded", "type": "boolean" - }, - { - "name": "window_id", - "type": "integer" } ] }, diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index a81757308d98..5b1eeeb7c57c 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -156,7 +156,7 @@ class RewardsService : public KeyedService { virtual void UpdateRecurringDonationsList() = 0; virtual void UpdateTipsList() = 0; virtual void SetContributionAutoInclude( - const std::string& publisher_key, bool excluded, uint64_t windowId) = 0; + const std::string& publisher_key, bool excluded) = 0; virtual RewardsNotificationService* GetNotificationService() const = 0; virtual bool CheckImported() = 0; virtual void SetBackupCompleted() = 0; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 00c30eca1e48..21abaa5fd5f1 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -709,7 +709,7 @@ void RewardsServiceImpl::ExcludePublisher( return; bat_ledger_->SetPublisherExclude(publisherKey, - ledger::PUBLISHER_EXCLUDE::EXCLUDED); + ledger::PUBLISHER_EXCLUDE::EXCLUDED); } void RewardsServiceImpl::RestorePublishers() { @@ -2277,13 +2277,17 @@ void RewardsServiceImpl::TriggerOnGetCurrentBalanceReport( } void RewardsServiceImpl::SetContributionAutoInclude( - const std::string& publisher_key, bool excluded, uint64_t windowId) { + const std::string& publisher_key, + bool excluded) { if (!Connected()) return; - bat_ledger_->SetPublisherPanelExclude(publisher_key, excluded ? - ledger::PUBLISHER_EXCLUDE::EXCLUDED : ledger::PUBLISHER_EXCLUDE::INCLUDED, - windowId); + ledger::PUBLISHER_EXCLUDE exclude = + excluded + ? ledger::PUBLISHER_EXCLUDE::EXCLUDED + : ledger::PUBLISHER_EXCLUDE::INCLUDED; + + bat_ledger_->SetPublisherExclude(publisher_key, exclude); } RewardsNotificationService* RewardsServiceImpl::GetNotificationService() const { diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 17ae252dc9cb..04e80d296159 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -163,8 +163,7 @@ class RewardsServiceImpl : public RewardsService, void UpdateTipsList() override; void SetContributionAutoInclude( const std::string& publisher_key, - bool excluded, - uint64_t window_id) override; + bool excluded) override; RewardsNotificationService* GetNotificationService() const override; bool CheckImported() override; void SetBackupCompleted() override; diff --git a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts index 8359af8f2d75..9d06944583b4 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts @@ -57,10 +57,9 @@ export const deleteNotification = (id: string) => action(types.DELETE_NOTIFICATI id }) -export const includeInAutoContribution = (publisherKey: string, excluded: boolean, windowId: number) => action(types.INCLUDE_IN_AUTO_CONTRIBUTION, { +export const includeInAutoContribution = (publisherKey: string, excluded: boolean) => action(types.INCLUDE_IN_AUTO_CONTRIBUTION, { publisherKey, - excluded, - windowId + excluded }) export const getGrants = () => action(types.GET_GRANTS) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts index 540f37c4aa19..2f211b5fc679 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts @@ -214,9 +214,7 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a case types.INCLUDE_IN_AUTO_CONTRIBUTION: { let publisherKey = payload.publisherKey let excluded = payload.excluded - let windowId = payload.windowId - chrome.braveRewards.includeInAutoContribution(publisherKey, excluded, - windowId) + chrome.braveRewards.includeInAutoContribution(publisherKey, excluded) break } case types.ON_PENDING_CONTRIBUTIONS_TOTAL: { diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx index b454c079b443..9a0bd464fd0e 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx +++ b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx @@ -89,7 +89,7 @@ export class Panel extends React.Component { const publisherKey = publisher && publisher.publisher_key const excluded = publisher && publisher.excluded if (publisherKey && publisherKey.length > 0 && excluded !== undefined) { - this.props.actions.includeInAutoContribution(publisherKey, !excluded, this.props.windowId) + this.props.actions.includeInAutoContribution(publisherKey, !excluded) } } diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts index 24e4924bcb48..4a2587684480 100644 --- a/components/definitions/chromel.d.ts +++ b/components/definitions/chromel.d.ts @@ -39,7 +39,7 @@ declare namespace chrome.braveRewards { const onGrantCaptcha: { addListener: (callback: (properties: RewardsExtension.Captcha) => void) => void } - const includeInAutoContribution: (publisherKey: string, excluded: boolean, windowId: number) => {} + const includeInAutoContribution: (publisherKey: string, excluded: boolean) => {} const getGrants: () => {} const getGrantCaptcha: () => {} const solveGrantCaptcha: (solution: string, promotionId: string) => {} diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc index e00201928e94..f808dc1ff730 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc @@ -577,15 +577,6 @@ std::string BatLedgerClientMojoProxy::URIEncode(const std::string& value) { return encoded_value; } -void BatLedgerClientMojoProxy::SetContributionAutoInclude( - const std::string& publisher_key, bool excluded, uint64_t windowId) { - if (!Connected()) - return; - - bat_ledger_client_->SetContributionAutoInclude( - publisher_key, excluded, windowId); -} - void BatLedgerClientMojoProxy::SavePendingContribution( const ledger::PendingContributionList& list) { if (!Connected()) diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h index 8cb90a570627..fc35968c6a59 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h @@ -104,9 +104,6 @@ class BatLedgerClientMojoProxy : public ledger::LedgerClient, std::string URIEncode(const std::string& value) override; - void SetContributionAutoInclude(const std::string& publisher_key, - bool excluded, uint64_t windowId) override; - void SavePendingContribution( const ledger::PendingContributionList& list) override; diff --git a/components/services/bat_ledger/bat_ledger_impl.cc b/components/services/bat_ledger/bat_ledger_impl.cc index df6f44dbb88e..0b3a0eea1ec6 100644 --- a/components/services/bat_ledger/bat_ledger_impl.cc +++ b/components/services/bat_ledger/bat_ledger_impl.cc @@ -322,12 +322,6 @@ void BatLedgerImpl::RemoveRecurring(const std::string& publisher_key) { ledger_->RemoveRecurring(publisher_key); } -void BatLedgerImpl::SetPublisherPanelExclude(const std::string& publisher_key, - int32_t exclude, - uint64_t window_id) { - ledger_->SetPublisherPanelExclude(publisher_key, - ToLedgerPublisherExclude(exclude), window_id); -} void BatLedgerImpl::GetBootStamp(GetBootStampCallback callback) { std::move(callback).Run(ledger_->GetBootStamp()); diff --git a/components/services/bat_ledger/bat_ledger_impl.h b/components/services/bat_ledger/bat_ledger_impl.h index 9eca6d38f69d..d2883b1bb154 100644 --- a/components/services/bat_ledger/bat_ledger_impl.h +++ b/components/services/bat_ledger/bat_ledger_impl.h @@ -118,8 +118,6 @@ class BatLedgerImpl : public mojom::BatLedger, const std::string& currency) override; void RemoveRecurring(const std::string& publisher_key) override; - void SetPublisherPanelExclude(const std::string& publisher_key, - int32_t exclude, uint64_t window_id) override; void GetBootStamp(GetBootStampCallback callback) override; void GetRewardsMainEnabled( GetRewardsMainEnabledCallback callback) override; diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc index acfe380bd773..b80d634f4628 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc @@ -457,12 +457,6 @@ void LedgerClientMojoProxy::URIEncode(const std::string& value, std::move(callback).Run(ledger_client_->URIEncode(value)); } -void LedgerClientMojoProxy::SetContributionAutoInclude( - const std::string& publisher_key, bool excluded, uint64_t window_id) { - ledger_client_->SetContributionAutoInclude( - publisher_key, excluded, window_id); -} - // static void LedgerClientMojoProxy::OnLoadURL( CallbackHolder* holder, diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h index ee1f3da427f5..3b7813113236 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h @@ -82,9 +82,6 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient, void URIEncode(const std::string& value, URIEncodeCallback callback) override; - void SetContributionAutoInclude(const std::string& publisher_key, - bool excluded, uint64_t window_id) override; - void LoadURL(const std::string& url, const std::vector& headers, const std::string& content, diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom index 946316cff860..bb3306cd72c2 100644 --- a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom +++ b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom @@ -89,8 +89,6 @@ interface BatLedger { DoDirectDonation(string publisher_info, int32 amount, string currency); RemoveRecurring(string publisher_key); - SetPublisherPanelExclude(string publisher_key, int32 exclude, - uint64 window_id); GetBootStamp() => (uint64 boot_stamp); GetRewardsMainEnabled() => (bool main_enabled); @@ -158,9 +156,6 @@ interface BatLedgerClient { [Sync] URIEncode(string value) => (string encoded_value); - SetContributionAutoInclude(string publisher_key, bool excluded, - uint64 window_id); - SavePendingContribution(string list); LoadActivityInfo(string filter) => (int32 result, string publisher_info); diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger.h b/vendor/bat-native-ledger/include/bat/ledger/ledger.h index b4a52c6ae7d4..612292456a5b 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/ledger.h +++ b/vendor/bat-native-ledger/include/bat/ledger/ledger.h @@ -226,11 +226,6 @@ class LEDGER_EXPORT Ledger { const std::string& publisher_id, const ledger::PUBLISHER_EXCLUDE& exclude) = 0; - virtual void SetPublisherPanelExclude( - const std::string& publisher_id, - const ledger::PUBLISHER_EXCLUDE& exclude, - uint64_t windowId) = 0; - virtual void RestorePublishers() = 0; virtual bool IsWalletCreated() const = 0; diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h index c57dfd6530a3..c695a8ec1744 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h +++ b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h @@ -184,10 +184,6 @@ class LEDGER_EXPORT LedgerClient { const ledger::URL_METHOD method, ledger::LoadURLCallback callback) = 0; - virtual void SetContributionAutoInclude(const std::string& publisher_key, - bool excluded, - uint64_t windowId) = 0; - virtual void SavePendingContribution( const ledger::PendingContributionList& list) = 0; diff --git a/vendor/bat-native-ledger/src/bat_publishers.cc b/vendor/bat-native-ledger/src/bat_publishers.cc index c38f0cce06fe..bcbd5ce9222a 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.cc +++ b/vendor/bat-native-ledger/src/bat_publishers.cc @@ -295,18 +295,6 @@ void BatPublishers::setExclude(const std::string& publisher_id, _2)); } -void BatPublishers::setPanelExclude(const std::string& publisher_id, - const ledger::PUBLISHER_EXCLUDE& exclude, - uint64_t windowId) { - ledger_->GetPublisherInfo(publisher_id, - std::bind(&BatPublishers::onSetPanelExcludeInternal, - this, - exclude, - windowId, - _1, - _2)); -} - void BatPublishers::onSetExcludeInternal( ledger::PUBLISHER_EXCLUDE exclude, ledger::Result result, @@ -316,52 +304,15 @@ void BatPublishers::onSetExcludeInternal( return; } - if (!publisher_info) { + if (!publisher_info || publisher_info->excluded == exclude) { // handle error return; } - if (publisher_info->excluded == ledger::PUBLISHER_EXCLUDE::DEFAULT || - publisher_info->excluded == ledger::PUBLISHER_EXCLUDE::INCLUDED) { - publisher_info->excluded = ledger::PUBLISHER_EXCLUDE::EXCLUDED; - } else { - publisher_info->excluded = ledger::PUBLISHER_EXCLUDE::INCLUDED; - } - - setNumExcludedSitesInternal(exclude); - - std::string publisherKey = publisher_info->id; - - ledger_->SetPublisherInfo(std::move(publisher_info)); - - OnExcludedSitesChanged(publisherKey); -} - -void BatPublishers::onSetPanelExcludeInternal( - ledger::PUBLISHER_EXCLUDE exclude, - uint64_t windowId, - ledger::Result result, - std::unique_ptr publisher_info) { - if (result != ledger::Result::LEDGER_OK && - result != ledger::Result::NOT_FOUND) { - return; - } - - if (!publisher_info) { - // handle error - return; - } - - if (publisher_info->excluded == ledger::PUBLISHER_EXCLUDE::DEFAULT || - publisher_info->excluded == ledger::PUBLISHER_EXCLUDE::INCLUDED) { - publisher_info->excluded = ledger::PUBLISHER_EXCLUDE::EXCLUDED; - } else { - publisher_info->excluded = ledger::PUBLISHER_EXCLUDE::INCLUDED; - } + publisher_info->excluded = exclude; setNumExcludedSitesInternal(exclude); - ledger::VisitData visit_data; std::string publisherKey = publisher_info->id; ledger_->SetPublisherInfo(std::move(publisher_info)); diff --git a/vendor/bat-native-ledger/src/bat_publishers.h b/vendor/bat-native-ledger/src/bat_publishers.h index d87922e0c2db..e1feda60fa07 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.h +++ b/vendor/bat-native-ledger/src/bat_publishers.h @@ -167,12 +167,6 @@ class BatPublishers : public ledger::LedgerCallbackHandler { ledger::Result result, std::unique_ptr publisher_info); - void onSetPanelExcludeInternal( - ledger::PUBLISHER_EXCLUDE exclude, - uint64_t windowId, - ledger::Result result, - std::unique_ptr publisher_info); - void OnRestorePublishersInternal(bool success); void calcScoreConsts(const uint64_t& min_duration_seconds); diff --git a/vendor/bat-native-ledger/src/ledger_impl.cc b/vendor/bat-native-ledger/src/ledger_impl.cc index 684f7d3288c0..64a14119292f 100644 --- a/vendor/bat-native-ledger/src/ledger_impl.cc +++ b/vendor/bat-native-ledger/src/ledger_impl.cc @@ -391,13 +391,6 @@ void LedgerImpl::SetPublisherExclude( bat_publishers_->setExclude(publisher_id, exclude); } -void LedgerImpl::SetPublisherPanelExclude( - const std::string& publisher_id, - const ledger::PUBLISHER_EXCLUDE& exclude, - uint64_t windowId) { - bat_publishers_->setPanelExclude(publisher_id, exclude, windowId); -} - void LedgerImpl::RestorePublishers() { bat_publishers_->RestorePublishers(); } diff --git a/vendor/bat-native-ledger/src/ledger_impl.h b/vendor/bat-native-ledger/src/ledger_impl.h index 06d81ed9993c..bb9dee923b24 100644 --- a/vendor/bat-native-ledger/src/ledger_impl.h +++ b/vendor/bat-native-ledger/src/ledger_impl.h @@ -234,11 +234,6 @@ class LedgerImpl : public ledger::Ledger, const std::string& publisher_id, const ledger::PUBLISHER_EXCLUDE& exclude) override; - void SetPublisherPanelExclude( - const std::string& publisher_id, - const ledger::PUBLISHER_EXCLUDE& exclude, - uint64_t windowId) override; - void RestorePublishers() override; void OnRestorePublishers(ledger::OnRestoreCallback callback); From b0a3c7da61765650eca9c189c6c91692d1d47fe5 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Tue, 26 Feb 2019 17:39:08 +0100 Subject: [PATCH 2/3] Fixes include/excludde update in the panel Resolves https://github.com/brave/brave-browser/issues/3476 --- browser/ui/webui/brave_rewards_ui.cc | 6 +- common/extensions/api/brave_rewards.json | 21 +++++ .../extension_rewards_service_observer.cc | 23 +++++ .../extension_rewards_service_observer.h | 3 + .../browser/rewards_service_impl.cc | 7 +- .../browser/rewards_service_impl.h | 3 +- .../browser/rewards_service_impl_unittest.cc | 2 +- .../browser/rewards_service_observer.h | 3 +- .../actions/rewards_panel_actions.ts | 5 ++ .../background/events/rewardsEvents.ts | 4 + .../reducers/rewards_panel_reducer.ts | 30 +++++++ .../constants/rewards_panel_types.ts | 3 +- components/definitions/chromel.d.ts | 3 + components/definitions/rewardsExtensions.d.ts | 5 ++ .../bat_ledger_client_mojo_proxy.cc | 5 +- .../bat_ledger/bat_ledger_client_mojo_proxy.h | 3 +- .../public/cpp/ledger_client_mojo_proxy.cc | 7 +- .../public/cpp/ledger_client_mojo_proxy.h | 3 +- .../public/interfaces/bat_ledger.mojom | 2 +- .../reducers/rewards_panel_reducer_test.ts | 83 ++++++++++++++++++- .../test/confirmations_client_mock.h | 5 +- .../include/bat/ledger/ledger_client.h | 3 +- .../bat-native-ledger/src/bat_publishers.cc | 9 +- vendor/bat-native-ledger/src/bat_publishers.h | 3 +- vendor/bat-native-ledger/src/ledger_impl.cc | 5 +- vendor/bat-native-ledger/src/ledger_impl.h | 3 +- 26 files changed, 221 insertions(+), 28 deletions(-) diff --git a/browser/ui/webui/brave_rewards_ui.cc b/browser/ui/webui/brave_rewards_ui.cc index c310cdc51aea..f81c16b63eb7 100644 --- a/browser/ui/webui/brave_rewards_ui.cc +++ b/browser/ui/webui/brave_rewards_ui.cc @@ -130,7 +130,8 @@ class RewardsDOMHandler : public WebUIMessageHandler, unsigned int result, brave_rewards::Grant grant) override; void OnExcludedSitesChanged(brave_rewards::RewardsService* rewards_service, - std::string publisher_id) override; + std::string publisher_id, + bool excluded) override; void OnReconcileComplete(brave_rewards::RewardsService* rewards_service, unsigned int result, const std::string& viewing_id, @@ -621,7 +622,8 @@ void RewardsDOMHandler::OnGetNumExcludedSites(const std::string& publisher_id, void RewardsDOMHandler::OnExcludedSitesChanged( brave_rewards::RewardsService* rewards_service, - std::string publisher_id) { + std::string publisher_id, + bool excluded) { if (rewards_service_) rewards_service_->GetNumExcludedSites(base::Bind( &RewardsDOMHandler::OnGetNumExcludedSites, diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json index b44ace0d99ea..0a0e88844257 100644 --- a/common/extensions/api/brave_rewards.json +++ b/common/extensions/api/brave_rewards.json @@ -266,6 +266,27 @@ } } ] + }, + { + "name": "onExcludedSitesChanged", + "type": "function", + "description": "Fired when grant process is finished", + "parameters": [ + { + "name": "properties", + "type": "object", + "properties": { + "publisher_key": { + "type": "string", + "description": "publisher key, unique identifier" + }, + "excluded": { + "type": "boolean", + "description": "indicate if publisher is excluded or not" + } + } + } + ] } ], "functions": [ diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.cc b/components/brave_rewards/browser/extension_rewards_service_observer.cc index 7fc134468c9f..329b86ee6483 100644 --- a/components/brave_rewards/browser/extension_rewards_service_observer.cc +++ b/components/brave_rewards/browser/extension_rewards_service_observer.cc @@ -302,4 +302,27 @@ void ExtensionRewardsServiceObserver::OnPublisherListNormalized( event_router->BroadcastEvent(std::move(event)); } +void ExtensionRewardsServiceObserver::OnExcludedSitesChanged( + RewardsService* rewards_service, + std::string publisher_key, + bool excluded) { + auto* event_router = extensions::EventRouter::Get(profile_); + if (!event_router) { + return; + } + + extensions::api::brave_rewards::OnExcludedSitesChanged::Properties result; + result.publisher_key = publisher_key; + result.excluded = excluded; + + std::unique_ptr args( + extensions::api::brave_rewards::OnExcludedSitesChanged::Create(result) + .release()); + std::unique_ptr event(new extensions::Event( + extensions::events::BRAVE_START, + extensions::api::brave_rewards::OnExcludedSitesChanged::kEventName, + std::move(args))); + event_router->BroadcastEvent(std::move(event)); +} + } // namespace brave_rewards diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.h b/components/brave_rewards/browser/extension_rewards_service_observer.h index 6b9c6fbb42f1..a362fa728312 100644 --- a/components/brave_rewards/browser/extension_rewards_service_observer.h +++ b/components/brave_rewards/browser/extension_rewards_service_observer.h @@ -34,6 +34,9 @@ class ExtensionRewardsServiceObserver : public RewardsServiceObserver, void OnPublisherListNormalized( RewardsService* rewards_service, brave_rewards::ContentSiteList list) override; + void OnExcludedSitesChanged(RewardsService* rewards_service, + std::string publisher_key, + bool excluded) override; // RewardsServicePrivateObserver implementation void OnGetCurrentBalanceReport(RewardsService* rewards_service, diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 21abaa5fd5f1..0426079e0459 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -1871,9 +1871,12 @@ void RewardsServiceImpl::GetPublisherActivityFromUrl( } void RewardsServiceImpl::OnExcludedSitesChanged( - const std::string& publisher_id) { + const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) { + + bool excluded = exclude == ledger::PUBLISHER_EXCLUDE::EXCLUDED; for (auto& observer : observers_) - observer.OnExcludedSitesChanged(this, publisher_id); + observer.OnExcludedSitesChanged(this, publisher_id, excluded); } void RewardsServiceImpl::OnPanelPublisherInfo( diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 04e80d296159..63f94c226413 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -332,7 +332,8 @@ class RewardsServiceImpl : public RewardsService, brave_rewards::ConfirmationsHistoryCallback callback) override; void ConfirmationsTransactionHistoryDidChange() override; - void OnExcludedSitesChanged(const std::string& publisher_id) override; + void OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) override; void OnPanelPublisherInfo(ledger::Result result, std::unique_ptr info, uint64_t window_id) override; diff --git a/components/brave_rewards/browser/rewards_service_impl_unittest.cc b/components/brave_rewards/browser/rewards_service_impl_unittest.cc index 0e75dda02adc..8258a192ed33 100644 --- a/components/brave_rewards/browser/rewards_service_impl_unittest.cc +++ b/components/brave_rewards/browser/rewards_service_impl_unittest.cc @@ -39,7 +39,7 @@ class MockRewardsServiceObserver : public RewardsServiceObserver { MOCK_METHOD3(OnGrantFinish, void(RewardsService*, unsigned int, brave_rewards::Grant)); MOCK_METHOD1(OnContentSiteUpdated, void(RewardsService*)); - MOCK_METHOD2(OnExcludedSitesChanged, void(RewardsService*, std::string)); + MOCK_METHOD3(OnExcludedSitesChanged, void(RewardsService*, std::string, bool)); MOCK_METHOD5(OnReconcileComplete, void(RewardsService*, unsigned int, const std::string&, diff --git a/components/brave_rewards/browser/rewards_service_observer.h b/components/brave_rewards/browser/rewards_service_observer.h index 8fe86bd44bfe..9795b439be0e 100644 --- a/components/brave_rewards/browser/rewards_service_observer.h +++ b/components/brave_rewards/browser/rewards_service_observer.h @@ -52,7 +52,8 @@ class RewardsServiceObserver : public base::CheckedObserver { RewardsService* rewards_service) {} virtual void OnExcludedSitesChanged( RewardsService* rewards_service, - std::string publisher_id) {} + std::string publisher_id, + bool excluded) {} virtual void OnReconcileComplete( RewardsService* rewards_service, unsigned int result, diff --git a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts index 9d06944583b4..0c8ae02ad938 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts @@ -105,3 +105,8 @@ export const onPublisherListNormalized = (properties: RewardsExtension.Publisher action(types.ON_PUBLISHER_LIST_NORMALIZED, { properties }) + +export const onExcludedSitesChanged = (properties: RewardsExtension.ExcludedSitesChanged) => + action(types.ON_EXCLUDED_SITES_CHANGED, { + properties + }) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts b/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts index ed5802bd3e2c..eff0d9b62706 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts @@ -59,3 +59,7 @@ chrome.braveRewards.onWalletFailed.addListener(() => { chrome.braveRewards.onPublisherListNormalized.addListener((properties: RewardsExtension.PublisherNormalized[]) => { rewardsPanelActions.onPublisherListNormalized(properties) }) + +chrome.braveRewards.onExcludedSitesChanged.addListener((properties: RewardsExtension.ExcludedSitesChanged) => { + rewardsPanelActions.onExcludedSitesChanged(properties) +}) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts index 2f211b5fc679..e49503541a4d 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts @@ -252,11 +252,41 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a if (updated) { publisher.verified = updated.verified publisher.percentage = updated.percentage + publisher.excluded = false } else { publisher.percentage = 0 } } + state = { + ...state, + publishers + } + break + } + case types.ON_EXCLUDED_SITES_CHANGED: { + if (!payload.properties) { + break + } + + const publisherKey: string = payload.properties.publisher_key + + if (!publisherKey) { + break + } + + const excluded: boolean = payload.properties.excluded + + let publishers: Record = state.publishers + + for (const key in publishers) { + let publisher = publishers[key] + + if (publisher.publisher_key === publisherKey) { + publisher.excluded = !!excluded + } + } + state = { ...state, publishers diff --git a/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts b/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts index ca9e4a5f6e95..58dc410a760b 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts @@ -28,7 +28,8 @@ export const enum types { ON_PENDING_CONTRIBUTIONS_TOTAL = '@@rewards_panel/ON_PENDING_CONTRIBUTIONS_TOTAL', ON_ENABLED_MAIN = '@@rewards_panel/ON_ENABLED_MAIN', ON_ENABLED_AC = '@@rewards_panel/ON_ENABLED_AC', - ON_PUBLISHER_LIST_NORMALIZED = '@@rewards_panel/ON_PUBLISHER_LIST_NORMALIZED' + ON_PUBLISHER_LIST_NORMALIZED = '@@rewards_panel/ON_PUBLISHER_LIST_NORMALIZED', + ON_EXCLUDED_SITES_CHANGED = '@@rewards_panel/ON_EXCLUDED_SITES_CHANGED' } // Note: This declaration must match the RewardsNotificationType enum in diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts index 4a2587684480..f7186e6ffb76 100644 --- a/components/definitions/chromel.d.ts +++ b/components/definitions/chromel.d.ts @@ -60,6 +60,9 @@ declare namespace chrome.braveRewards { const onPublisherListNormalized: { addListener: (callback: (properties: RewardsExtension.PublisherNormalized[]) => void) => void } + const onExcludedSitesChanged: { + addListener: (callback: (properties: RewardsExtension.ExcludedSitesChanged) => void) => void + } } declare namespace chrome.rewardsNotifications { diff --git a/components/definitions/rewardsExtensions.d.ts b/components/definitions/rewardsExtensions.d.ts index 7e2d0a940c02..a881db197690 100644 --- a/components/definitions/rewardsExtensions.d.ts +++ b/components/definitions/rewardsExtensions.d.ts @@ -120,4 +120,9 @@ declare namespace RewardsExtension { percentage: number verified: boolean } + + interface ExcludedSitesChanged { + publisher_key: string + excluded: boolean + } } diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc index f808dc1ff730..84967213ec94 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc @@ -430,12 +430,13 @@ void BatLedgerClientMojoProxy::KillTimer(const uint32_t timer_id) { } void BatLedgerClientMojoProxy::OnExcludedSitesChanged( - const std::string& publisher_id) { + const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) { if (!Connected()) { return; } - bat_ledger_client_->OnExcludedSitesChanged(publisher_id); + bat_ledger_client_->OnExcludedSitesChanged(publisher_id, exclude); } void BatLedgerClientMojoProxy::OnPanelPublisherInfo(ledger::Result result, diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h index fc35968c6a59..be8aea837104 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h @@ -70,7 +70,8 @@ class BatLedgerClientMojoProxy : public ledger::LedgerClient, const ledger::URL_METHOD method, ledger::LoadURLCallback callback) override; - void OnExcludedSitesChanged(const std::string& publisher_id) override; + void OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) override; void OnPanelPublisherInfo(ledger::Result result, std::unique_ptr info, uint64_t windowId) override; diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc index b80d634f4628..572fb6607d19 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc @@ -333,8 +333,11 @@ void LedgerClientMojoProxy::KillTimer(const uint32_t timer_id) { } void LedgerClientMojoProxy::OnExcludedSitesChanged( - const std::string& publisher_id) { - ledger_client_->OnExcludedSitesChanged(publisher_id); + const std::string& publisher_id, + int exclude) { + ledger_client_->OnExcludedSitesChanged( + publisher_id, + static_cast(exclude)); } void LedgerClientMojoProxy::OnPanelPublisherInfo(int32_t result, diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h index 3b7813113236..6c2042834ea8 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h @@ -68,7 +68,8 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient, void KillTimer(const uint32_t timer_id) override; void OnPanelPublisherInfo(int32_t result, const std::string& info, uint64_t window_id) override; - void OnExcludedSitesChanged(const std::string& publisher_id) override; + void OnExcludedSitesChanged(const std::string& publisher_id, + int exclude) override; void SaveContributionInfo(const std::string& probi, int32_t month, int32_t year, uint32_t date, const std::string& publisher_key, int32_t category) override; diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom index bb3306cd72c2..a8dcd4f19a1c 100644 --- a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom +++ b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom @@ -145,7 +145,7 @@ interface BatLedgerClient { [Sync] SetTimer(uint64 time_offset) => (uint32 timer_id); KillTimer(uint32 timer_id); - OnExcludedSitesChanged(string publisher_id); + OnExcludedSitesChanged(string publisher_id, int32 exclude); SaveContributionInfo(string probi, int32 month, int32 year, uint32 date, string publisher_key, int32 category); SaveMediaPublisherInfo(string media_key, string publisher_id); diff --git a/components/test/brave_rewards/extension/brave_rewards/background/reducers/rewards_panel_reducer_test.ts b/components/test/brave_rewards/extension/brave_rewards/background/reducers/rewards_panel_reducer_test.ts index 5607a7b9ce9d..1b513ac3e93c 100644 --- a/components/test/brave_rewards/extension/brave_rewards/background/reducers/rewards_panel_reducer_test.ts +++ b/components/test/brave_rewards/extension/brave_rewards/background/reducers/rewards_panel_reducer_test.ts @@ -196,7 +196,8 @@ describe('rewards panel reducer', () => { tabUrl: 'https://brave.com', publisher_key: 'brave.com', percentage: 30, - verified: false + verified: false, + excluded: true }, id_2: { tabUrl: 'https://brave4.com', @@ -213,7 +214,8 @@ describe('rewards panel reducer', () => { tabUrl: 'https://brave.com', publisher_key: 'brave.com', percentage: 50, - verified: true + verified: true, + excluded: false }, id_2: { tabUrl: 'https://brave4.com', @@ -234,4 +236,81 @@ describe('rewards panel reducer', () => { expect(state.rewardsPanelData).toEqual(expectedState) }) }) + + describe('ON_EXCLUDED_SITES_CHANGED', () => { + it('properties is undefined', () => { + let state = reducers({ rewardsPanelData: defaultState }, { + type: types.ON_EXCLUDED_SITES_CHANGED, + payload: { + properties: undefined + } + }) + + expect(state.rewardsPanelData).toEqual(defaultState) + }) + + it('publisher key is undefined', () => { + let state = reducers({ rewardsPanelData: defaultState }, { + type: types.ON_EXCLUDED_SITES_CHANGED, + payload: { + properties: { + publisher_key: '' + } + } + }) + + expect(state.rewardsPanelData).toEqual(defaultState) + }) + + it('publisher is update accordingly', () => { + let state = { + ...defaultState, + publishers: { + id_1: { + tabUrl: 'https://brave.com', + publisher_key: 'brave.com', + percentage: 30, + verified: false, + excluded: true + }, + id_2: { + tabUrl: 'https://brave4.com', + publisher_key: 'brave4.com', + percentage: 40, + verified: true + } + } + } + const expectedState: Rewards.State = { + ...defaultState, + publishers: { + id_1: { + tabUrl: 'https://brave.com', + publisher_key: 'brave.com', + percentage: 30, + verified: false, + excluded: false + }, + id_2: { + tabUrl: 'https://brave4.com', + publisher_key: 'brave4.com', + percentage: 40, + verified: true + } + } + } + + state = reducers({ rewardsPanelData: state }, { + type: types.ON_EXCLUDED_SITES_CHANGED, + payload: { + properties: { + publisher_key: 'brave.com', + excluded: false + } + } + }) + + expect(state.rewardsPanelData).toEqual(expectedState) + }) + }) }) diff --git a/vendor/bat-native-confirmations/test/confirmations_client_mock.h b/vendor/bat-native-confirmations/test/confirmations_client_mock.h index a37f93b230eb..42f2e70a02bc 100644 --- a/vendor/bat-native-confirmations/test/confirmations_client_mock.h +++ b/vendor/bat-native-confirmations/test/confirmations_client_mock.h @@ -155,8 +155,9 @@ class MockConfirmationsClient : public ConfirmationsClient { std::unique_ptr, uint64_t windowId)); - MOCK_METHOD1(OnExcludedSitesChanged, void( - const std::string& publisher_id)); + MOCK_METHOD2(OnExcludedSitesChanged, void( + const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude)); MOCK_METHOD3(FetchFavIcon, void( const std::string& url, diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h index c695a8ec1744..d4471c1478eb 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h +++ b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h @@ -149,7 +149,8 @@ class LEDGER_EXPORT LedgerClient { std::unique_ptr, uint64_t windowId) = 0; - virtual void OnExcludedSitesChanged(const std::string& publisher_id) = 0; + virtual void OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) = 0; virtual void FetchFavIcon(const std::string& url, const std::string& favicon_key, diff --git a/vendor/bat-native-ledger/src/bat_publishers.cc b/vendor/bat-native-ledger/src/bat_publishers.cc index bcbd5ce9222a..a3c4ad3c7d00 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.cc +++ b/vendor/bat-native-ledger/src/bat_publishers.cc @@ -317,7 +317,7 @@ void BatPublishers::onSetExcludeInternal( ledger_->SetPublisherInfo(std::move(publisher_info)); - OnExcludedSitesChanged(publisherKey); + OnExcludedSitesChanged(publisherKey, exclude); } void BatPublishers::RestorePublishers() { @@ -330,7 +330,7 @@ void BatPublishers::RestorePublishers() { void BatPublishers::OnRestorePublishersInternal(bool success) { if (success) { setNumExcludedSites(0); - OnExcludedSitesChanged(""); + OnExcludedSitesChanged("", ledger::PUBLISHER_EXCLUDE::ALL); SynopsisNormalizer(); } else { BLOG(ledger_, ledger::LogLevel::LOG_ERROR) << @@ -770,8 +770,9 @@ void BatPublishers::OnPanelPublisherInfo( } } -void BatPublishers::OnExcludedSitesChanged(const std::string& publisher_id) { - ledger_->OnExcludedSitesChanged(publisher_id); +void BatPublishers::OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) { + ledger_->OnExcludedSitesChanged(publisher_id, exclude); } void BatPublishers::setBalanceReportItem(ledger::ACTIVITY_MONTH month, diff --git a/vendor/bat-native-ledger/src/bat_publishers.h b/vendor/bat-native-ledger/src/bat_publishers.h index e1feda60fa07..cea0fc9e8117 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.h +++ b/vendor/bat-native-ledger/src/bat_publishers.h @@ -197,7 +197,8 @@ class BatPublishers : public ledger::LedgerCallbackHandler { uint64_t windowId, const ledger::VisitData& visit_data); - void OnExcludedSitesChanged(const std::string& publisher_id); + void OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude); void onPublisherBanner(ledger::PublisherBannerCallback callback, ledger::PublisherBanner banner, diff --git a/vendor/bat-native-ledger/src/ledger_impl.cc b/vendor/bat-native-ledger/src/ledger_impl.cc index 64a14119292f..4f0c8ae37302 100644 --- a/vendor/bat-native-ledger/src/ledger_impl.cc +++ b/vendor/bat-native-ledger/src/ledger_impl.cc @@ -903,8 +903,9 @@ void LedgerImpl::OnPanelPublisherInfo( ledger_client_->OnPanelPublisherInfo(result, std::move(info), windowId); } -void LedgerImpl::OnExcludedSitesChanged(const std::string& publisher_id) { - ledger_client_->OnExcludedSitesChanged(publisher_id); +void LedgerImpl::OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude) { + ledger_client_->OnExcludedSitesChanged(publisher_id, exclude); } void LedgerImpl::SetBalanceReportItem(ledger::ACTIVITY_MONTH month, diff --git a/vendor/bat-native-ledger/src/ledger_impl.h b/vendor/bat-native-ledger/src/ledger_impl.h index bb9dee923b24..1010c1d73a74 100644 --- a/vendor/bat-native-ledger/src/ledger_impl.h +++ b/vendor/bat-native-ledger/src/ledger_impl.h @@ -255,7 +255,8 @@ class LedgerImpl : public ledger::Ledger, std::unique_ptr info, uint64_t windowId); - void OnExcludedSitesChanged(const std::string& publisher_id); + void OnExcludedSitesChanged(const std::string& publisher_id, + ledger::PUBLISHER_EXCLUDE exclude); void SetBalanceReportItem(ledger::ACTIVITY_MONTH month, int year, From 4c0698b76d4982d8aebfb0fbe23dfaafe816f49c Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Wed, 27 Feb 2019 08:48:05 +0100 Subject: [PATCH 3/3] Fixes linter errors --- .../browser/extension_rewards_service_observer.h | 12 +++++++----- .../brave_rewards/browser/rewards_service_impl.h | 1 + .../browser/rewards_service_impl_unittest.cc | 7 +++++-- .../brave_rewards/browser/rewards_service_observer.h | 1 + .../public/cpp/ledger_client_mojo_proxy.cc | 6 ++++-- .../include/bat/ledger/ledger_client.h | 3 ++- vendor/bat-native-ledger/src/bat_publishers.cc | 11 +++++++---- vendor/bat-native-ledger/src/bat_publishers.h | 2 +- vendor/bat-native-ledger/src/ledger_impl.h | 6 +++--- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/components/brave_rewards/browser/extension_rewards_service_observer.h b/components/brave_rewards/browser/extension_rewards_service_observer.h index a362fa728312..9f1a01c2b680 100644 --- a/components/brave_rewards/browser/extension_rewards_service_observer.h +++ b/components/brave_rewards/browser/extension_rewards_service_observer.h @@ -1,11 +1,13 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_H_ #include +#include #include "base/macros.h" #include "brave/components/brave_rewards/browser/content_site.h" @@ -21,7 +23,7 @@ class RewardsService; class ExtensionRewardsServiceObserver : public RewardsServiceObserver, public RewardsServicePrivateObserver { public: - ExtensionRewardsServiceObserver(Profile* profile); + explicit ExtensionRewardsServiceObserver(Profile* profile); ~ExtensionRewardsServiceObserver() override; // RewardsServiceObserver implementation @@ -69,4 +71,4 @@ class ExtensionRewardsServiceObserver : public RewardsServiceObserver, } // namespace brave_rewards -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_EXTENSION_REWARDS_SERVICE_OBSERVER_H_ diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 63f94c226413..39aaebd0b47b 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "bat/ledger/ledger.h" diff --git a/components/brave_rewards/browser/rewards_service_impl_unittest.cc b/components/brave_rewards/browser/rewards_service_impl_unittest.cc index 8258a192ed33..8462155d42b7 100644 --- a/components/brave_rewards/browser/rewards_service_impl_unittest.cc +++ b/components/brave_rewards/browser/rewards_service_impl_unittest.cc @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -39,7 +40,9 @@ class MockRewardsServiceObserver : public RewardsServiceObserver { MOCK_METHOD3(OnGrantFinish, void(RewardsService*, unsigned int, brave_rewards::Grant)); MOCK_METHOD1(OnContentSiteUpdated, void(RewardsService*)); - MOCK_METHOD3(OnExcludedSitesChanged, void(RewardsService*, std::string, bool)); + MOCK_METHOD3(OnExcludedSitesChanged, void(RewardsService*, + std::string, + bool)); MOCK_METHOD5(OnReconcileComplete, void(RewardsService*, unsigned int, const std::string&, diff --git a/components/brave_rewards/browser/rewards_service_observer.h b/components/brave_rewards/browser/rewards_service_observer.h index 9795b439be0e..9fa74d3139a0 100644 --- a/components/brave_rewards/browser/rewards_service_observer.h +++ b/components/brave_rewards/browser/rewards_service_observer.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_SERVICE_OBSERVER_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_SERVICE_OBSERVER_H_ +#include #include #include diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc index 572fb6607d19..aba537b16d82 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc @@ -8,11 +8,13 @@ #include "base/logging.h" #include "mojo/public/cpp/bindings/map.h" -using namespace std::placeholders; +using std::placeholders::_1; +using std::placeholders::_2; +using std::placeholders::_3; namespace bat_ledger { -namespace { // TODO, move into a util class +namespace { // TODO(anyone): move into a util class int32_t ToMojomResult(ledger::Result result) { return (int32_t)result; diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h index d4471c1478eb..13827a62f598 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h +++ b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h @@ -64,7 +64,8 @@ using LoadURLCallback = std::function& headers)>; using OnRestoreCallback = std::function; using OnSaveCallback = std::function; -using OnLoadCallback = std::function; +using OnLoadCallback = std::function; using OnResetCallback = std::function; class LEDGER_EXPORT LedgerClient { diff --git a/vendor/bat-native-ledger/src/bat_publishers.cc b/vendor/bat-native-ledger/src/bat_publishers.cc index a3c4ad3c7d00..3d619dccf312 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.cc +++ b/vendor/bat-native-ledger/src/bat_publishers.cc @@ -5,9 +5,10 @@ #include "bat_publishers.h" -#include -#include #include +#include +#include +#include #include "bat_helper.h" #include "bignum.h" @@ -28,7 +29,8 @@ TLD = 'co.jp' */ -using namespace std::placeholders; +using std::placeholders::_1; +using std::placeholders::_2; namespace braveledger_bat_publishers { @@ -788,7 +790,8 @@ void BatPublishers::setBalanceReportItem(ledger::ACTIVITY_MONTH month, braveledger_bat_bignum::sum(report_info.grants_, probi); break; case ledger::ReportType::ADS: - report_info.earning_from_ads_ = braveledger_bat_bignum::sum(report_info.earning_from_ads_, probi); + report_info.earning_from_ads_ = + braveledger_bat_bignum::sum(report_info.earning_from_ads_, probi); break; case ledger::ReportType::AUTO_CONTRIBUTION: report_info.auto_contribute_ = diff --git a/vendor/bat-native-ledger/src/bat_publishers.h b/vendor/bat-native-ledger/src/bat_publishers.h index cea0fc9e8117..e22c584888ab 100644 --- a/vendor/bat-native-ledger/src/bat_publishers.h +++ b/vendor/bat-native-ledger/src/bat_publishers.h @@ -30,7 +30,7 @@ namespace braveledger_bat_publishers { class BatPublishers : public ledger::LedgerCallbackHandler { public: - BatPublishers(bat_ledger::LedgerImpl* ledger); + explicit BatPublishers(bat_ledger::LedgerImpl* ledger); ~BatPublishers() override; diff --git a/vendor/bat-native-ledger/src/ledger_impl.h b/vendor/bat-native-ledger/src/ledger_impl.h index 1010c1d73a74..e22d9a2f309e 100644 --- a/vendor/bat-native-ledger/src/ledger_impl.h +++ b/vendor/bat-native-ledger/src/ledger_impl.h @@ -182,7 +182,7 @@ class LedgerImpl : public ledger::Ledger, void FetchGrants(const std::string& lang, const std::string& paymentId) const override; - + void OnGrant(ledger::Result result, const braveledger_bat_helper::GRANT& grant); @@ -314,9 +314,9 @@ class LedgerImpl : public ledger::Ledger, const std::string& GetPaymentId() const; void SetPaymentId(const std::string& payment_id); - + const braveledger_bat_helper::Grants& GetGrants() const; - + void SetGrants(braveledger_bat_helper::Grants grants); const std::string& GetPersonaId() const;