diff --git a/DEPS b/DEPS index a7763b6f161..1ae517a21cf 100644 --- a/DEPS +++ b/DEPS @@ -11,7 +11,7 @@ deps = { "vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403", "vendor/omaha": "https://github.com/brave/omaha.git@b0b593b5751ef42e23974f33c65b7ad70f84b660", "vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0", - "vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@e11055783aaae7f22f528fde4d6369190815056b", + "vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@f4ed0e14a2e238f137530a0ff6b804e25fa21dca", "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@86aafe2ef89835ae71c9ed7c2527e3bb3000930e", "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@9b119931c702d55be994117eb505d56310720b1d", "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@adeff3254bb90ccdc9699040d5a4e1cd6b8393b7", diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index c7965830237..57f5ea08107 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -108,7 +108,7 @@ ExtensionFunction::ResponseAction BraveRewardsGetWalletPropertiesFunction::Run() Profile* profile = Profile::FromBrowserContext(browser_context()); RewardsService* rewards_service_ = RewardsServiceFactory::GetForProfile(profile); if (rewards_service_) { - rewards_service_->GetWalletProperties(); + rewards_service_->FetchWalletProperties(); } return RespondNow(NoArguments()); } diff --git a/browser/ui/webui/brave_donate_ui.cc b/browser/ui/webui/brave_donate_ui.cc index d476958bb0c..da7cf58a679 100644 --- a/browser/ui/webui/brave_donate_ui.cc +++ b/browser/ui/webui/brave_donate_ui.cc @@ -98,7 +98,7 @@ void RewardsDonateDOMHandler::GetWalletProperties(const base::ListValue* args) { if (!rewards_service_) return; - rewards_service_->GetWalletProperties(); + rewards_service_->FetchWalletProperties(); } void RewardsDonateDOMHandler::OnWalletProperties( diff --git a/browser/ui/webui/brave_rewards_ui.cc b/browser/ui/webui/brave_rewards_ui.cc index c90e7b10837..644fbbe9795 100644 --- a/browser/ui/webui/brave_rewards_ui.cc +++ b/browser/ui/webui/brave_rewards_ui.cc @@ -231,7 +231,7 @@ void RewardsDOMHandler::GetWalletProperties(const base::ListValue* args) { if (!rewards_service_) return; - rewards_service_->GetWalletProperties(); + rewards_service_->FetchWalletProperties(); } void RewardsDOMHandler::OnWalletInitialized( @@ -313,7 +313,7 @@ void RewardsDOMHandler::GetGrant(const base::ListValue* args) { std::string paymentId; args->GetString(0, &lang); args->GetString(1, &paymentId); - rewards_service_->GetGrant(lang, paymentId); + rewards_service_->FetchGrant(lang, paymentId); } } diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 954adea8d0f..6f8a75f2979 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -43,11 +43,11 @@ class RewardsService : public KeyedService { ~RewardsService() override; virtual void CreateWallet() = 0; - virtual void GetWalletProperties() = 0; + virtual void FetchWalletProperties() = 0; virtual void GetContentSiteList(uint32_t start, uint32_t limit, const GetContentSiteListCallback& callback) = 0; - virtual void GetGrant(const std::string& lang, const std::string& paymentId) = 0; + virtual void FetchGrant(const std::string& lang, const std::string& paymentId) = 0; virtual void GetGrantCaptcha() = 0; virtual void SolveGrantCaptcha(const std::string& solution) const = 0; virtual std::string GetWalletPassphrase() const = 0; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 5ba2fd1725b..5d7e1d45795 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -572,7 +572,7 @@ void RewardsServiceImpl::OnReconcileComplete(ledger::Result result, if (result == ledger::Result::LEDGER_OK) { // TODO add notification service when implemented auto now = base::Time::Now(); - GetWalletProperties(); + FetchWalletProperties(); ledger_->OnReconcileCompleteSuccess(viewing_id, category, probi, @@ -968,19 +968,19 @@ void RewardsServiceImpl::TriggerOnWalletProperties(int error_code, } } -void RewardsServiceImpl::GetWalletProperties() { +void RewardsServiceImpl::FetchWalletProperties() { if (ready().is_signaled()) { - ledger_->GetWalletProperties(); + ledger_->FetchWalletProperties(); } else { ready().Post(FROM_HERE, - base::Bind(&brave_rewards::RewardsService::GetWalletProperties, + base::Bind(&brave_rewards::RewardsService::FetchWalletProperties, base::Unretained(this))); } } -void RewardsServiceImpl::GetGrant(const std::string& lang, +void RewardsServiceImpl::FetchGrant(const std::string& lang, const std::string& payment_id) { - ledger_->GetGrant(lang, payment_id); + ledger_->FetchGrant(lang, payment_id); } void RewardsServiceImpl::TriggerOnGrant(ledger::Result result, diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 39550329b99..2ca8026dac5 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -65,8 +65,8 @@ class RewardsServiceImpl : public RewardsService, void Init(); void CreateWallet() override; - void GetWalletProperties() override; - void GetGrant(const std::string& lang, const std::string& paymentId) override; + void FetchWalletProperties() override; + void FetchGrant(const std::string& lang, const std::string& paymentId) override; void GetGrantCaptcha() override; void SolveGrantCaptcha(const std::string& solution) const override; std::string GetWalletPassphrase() const override;