Skip to content

Commit

Permalink
Removes UI suffix from rewards service as we don't need it anymore
Browse files Browse the repository at this point in the history 
Resolves brave/brave-browser#8161
  • Loading branch information
@NejcZdovc
NejcZdovc committed Apr 22, 2020
1 parent 0f998a1 commit 26d3a5c
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 90 deletions.
6 changes: 3 additions & 3 deletions browser/brave_rewards/android/brave_rewards_native_worker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ base::android::ScopedJavaLocalRef<jobjectArray>
void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj) {
if (brave_rewards_service_) {
brave_rewards_service_->GetPendingContributionsTotalUI(base::Bind(
brave_rewards_service_->GetPendingContributionsTotal(base::Bind(
&BraveRewardsNativeWorker::OnGetPendingContributionsTotal,
weak_factory_.GetWeakPtr()));
}
Expand All @@ -432,7 +432,7 @@ void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env,
void BraveRewardsNativeWorker::GetRecurringDonations(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj) {
if (brave_rewards_service_) {
brave_rewards_service_->GetRecurringTipsUI(base::Bind(
brave_rewards_service_->GetRecurringTips(base::Bind(
&BraveRewardsNativeWorker::OnGetRecurringTips,
weak_factory_.GetWeakPtr()));
}
Expand Down Expand Up @@ -546,7 +546,7 @@ void BraveRewardsNativeWorker::RemoveRecurring(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jstring>& publisher) {
if (brave_rewards_service_) {
brave_rewards_service_->RemoveRecurringTipUI(
brave_rewards_service_->RemoveRecurringTip(
base::android::ConvertJavaStringToUTF8(env, publisher));
}
}
Expand Down
8 changes: 4 additions & 4 deletions browser/extensions/api/brave_rewards_api.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ BraveRewardsGetPendingContributionsTotalFunction::Run() {
std::make_unique<base::Value>(0.0)));
}

rewards_service->GetPendingContributionsTotalUI(base::Bind(
rewards_service->GetPendingContributionsTotal(base::Bind(
&BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal,
this));
return RespondLater();
Expand Down Expand Up @@ -675,7 +675,7 @@ BraveRewardsSaveRecurringTipFunction::Run() {
return RespondNow(NoArguments());
}

rewards_service_->SaveRecurringTipUI(
rewards_service_->SaveRecurringTip(
params->publisher_key,
params->new_amount,
base::Bind(
Expand Down Expand Up @@ -707,7 +707,7 @@ BraveRewardsRemoveRecurringTipFunction::Run() {
RewardsServiceFactory::GetForProfile(profile);

if (rewards_service_) {
rewards_service_->RemoveRecurringTipUI(params->publisher_key);
rewards_service_->RemoveRecurringTip(params->publisher_key);
}

return RespondNow(NoArguments());
Expand All @@ -727,7 +727,7 @@ BraveRewardsGetRecurringTipsFunction::Run() {
return RespondNow(Error("Rewards service is not initialized"));
}

rewards_service->GetRecurringTipsUI(base::Bind(
rewards_service->GetRecurringTips(base::Bind(
&BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips,
this));
return RespondLater();
Expand Down
16 changes: 8 additions & 8 deletions browser/ui/webui/brave_rewards_page_ui.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ void RewardsDOMHandler::RestorePublishers(const base::ListValue *args) {
return;
}

rewards_service_->RestorePublishersUI();
rewards_service_->RestorePublishers();
}

void RewardsDOMHandler::RestorePublisher(const base::ListValue *args) {
Expand Down Expand Up @@ -991,14 +991,14 @@ void RewardsDOMHandler::RemoveRecurringTip(const base::ListValue *args) {
CHECK_EQ(1U, args->GetSize());
if (rewards_service_) {
const std::string publisherKey = args->GetList()[0].GetString();
rewards_service_->RemoveRecurringTipUI(publisherKey);
rewards_service_->RemoveRecurringTip(publisherKey);
}
}

void RewardsDOMHandler::GetRecurringTips(
const base::ListValue *args) {
if (rewards_service_) {
rewards_service_->GetRecurringTipsUI(base::BindOnce(
rewards_service_->GetRecurringTips(base::BindOnce(
&RewardsDOMHandler::OnGetRecurringTips,
weak_factory_.GetWeakPtr()));
}
Expand Down Expand Up @@ -1060,7 +1060,7 @@ void RewardsDOMHandler::OnGetOneTimeTips(

void RewardsDOMHandler::GetOneTimeTips(const base::ListValue *args) {
if (rewards_service_) {
rewards_service_->GetOneTimeTipsUI(base::BindOnce(
rewards_service_->GetOneTimeTips(base::BindOnce(
&RewardsDOMHandler::OnGetOneTimeTips,
weak_factory_.GetWeakPtr()));
}
Expand Down Expand Up @@ -1322,7 +1322,7 @@ void RewardsDOMHandler::SetBackupCompleted(const base::ListValue *args) {
void RewardsDOMHandler::GetPendingContributionsTotal(
const base::ListValue* args) {
if (rewards_service_) {
rewards_service_->GetPendingContributionsTotalUI(base::Bind(
rewards_service_->GetPendingContributionsTotal(base::Bind(
&RewardsDOMHandler::OnGetPendingContributionsTotal,
weak_factory_.GetWeakPtr()));
}
Expand Down Expand Up @@ -1452,7 +1452,7 @@ void RewardsDOMHandler::SetInlineTipSetting(const base::ListValue* args) {
void RewardsDOMHandler::GetPendingContributions(
const base::ListValue* args) {
if (rewards_service_) {
rewards_service_->GetPendingContributionsUI(base::Bind(
rewards_service_->GetPendingContributions(base::Bind(
&RewardsDOMHandler::OnGetPendingContributions,
weak_factory_.GetWeakPtr()));
}
Expand Down Expand Up @@ -1496,13 +1496,13 @@ void RewardsDOMHandler::RemovePendingContribution(
}

const uint64_t id = args->GetList()[0].GetInt();
rewards_service_->RemovePendingContributionUI(id);
rewards_service_->RemovePendingContribution(id);
}

void RewardsDOMHandler::RemoveAllPendingContributions(
const base::ListValue* args) {
if (rewards_service_) {
rewards_service_->RemoveAllPendingContributionsUI();
rewards_service_->RemoveAllPendingContributions();
}
}

Expand Down
2 changes: 1 addition & 1 deletion browser/ui/webui/brave_tip_ui.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void RewardsTipDOMHandler::OnTip(const base::ListValue* args) {
void RewardsTipDOMHandler::GetRecurringTips(
const base::ListValue *args) {
if (rewards_service_) {
rewards_service_->GetRecurringTipsUI(base::BindOnce(
rewards_service_->GetRecurringTips(base::BindOnce(
&RewardsTipDOMHandler::OnGetRecurringTips,
weak_factory_.GetWeakPtr()));
}
Expand Down
19 changes: 8 additions & 11 deletions components/brave_ads/browser/ads_service_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class MockRewardsService : public RewardsService {
MOCK_METHOD1(GetWalletPassphrase,
void(const brave_rewards::GetWalletPassphraseCallback&));
MOCK_METHOD1(RecoverWallet, void(const std::string&));
MOCK_METHOD0(RestorePublishersUI, void());
MOCK_METHOD0(RestorePublishers, void());
MOCK_METHOD2(OnLoad, void(SessionID, const GURL&));
MOCK_METHOD1(OnUnload, void(SessionID));
MOCK_METHOD1(OnShow, void(SessionID));
Expand Down Expand Up @@ -112,10 +112,10 @@ class MockRewardsService : public RewardsService {
double,
bool,
std::unique_ptr<brave_rewards::ContentSite>));
MOCK_METHOD1(RemoveRecurringTipUI, void(const std::string&));
MOCK_METHOD1(GetRecurringTipsUI,
MOCK_METHOD1(RemoveRecurringTip, void(const std::string&));
MOCK_METHOD1(GetRecurringTips,
void(brave_rewards::GetRecurringTipsCallback));
MOCK_METHOD1(GetOneTimeTipsUI, void(brave_rewards::GetOneTimeTipsCallback));
MOCK_METHOD1(GetOneTimeTips, void(brave_rewards::GetOneTimeTipsCallback));
MOCK_METHOD2(SetPublisherExclude, void(const std::string&, bool));
MOCK_CONST_METHOD0(GetNotificationService,
brave_rewards::RewardsNotificationService*());
Expand All @@ -140,7 +140,7 @@ class MockRewardsService : public RewardsService {
void(brave_rewards::GetRewardsInternalsInfoCallback));
MOCK_METHOD1(GetTransactionHistory,
void(brave_rewards::GetTransactionHistoryCallback));
MOCK_METHOD3(SaveRecurringTipUI,
MOCK_METHOD3(SaveRecurringTip,
void(const std::string&,
const double,
brave_rewards::SaveRecurringTipCallback));
Expand All @@ -162,13 +162,10 @@ class MockRewardsService : public RewardsService {
void(const std::string& type,
const std::map<std::string, std::string>& args,
brave_rewards::GetShareURLCallback callback));
MOCK_METHOD1(GetPendingContributionsUI,
MOCK_METHOD1(GetPendingContributions,
void(brave_rewards::GetPendingContributionsCallback));
MOCK_METHOD1(RemovePendingContributionUI, void(const uint64_t));
MOCK_METHOD0(RemoveAllPendingContributionsUI, void());

MOCK_METHOD1(GetPendingContributionsTotalUI, void(
const brave_rewards::GetPendingContributionsTotalCallback& callback));
MOCK_METHOD1(RemovePendingContribution, void(const uint64_t));
MOCK_METHOD0(RemoveAllPendingContributions, void());

MOCK_METHOD1(FetchBalance, void(
brave_rewards::FetchBalanceCallback callback));
Expand Down
23 changes: 12 additions & 11 deletions components/brave_rewards/browser/rewards_service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class RewardsService : public KeyedService {
virtual void GetWalletPassphrase(
const GetWalletPassphraseCallback& callback) = 0;
virtual void RecoverWallet(const std::string& passPhrase) = 0;
virtual void RestorePublishersUI() = 0;
virtual void RestorePublishers() = 0;
virtual void OnLoad(SessionID tab_id, const GURL& gurl) = 0;
virtual void OnUnload(SessionID tab_id) = 0;
virtual void OnShow(SessionID tab_id) = 0;
Expand Down Expand Up @@ -213,17 +213,17 @@ class RewardsService : public KeyedService {
const bool recurring,
std::unique_ptr<brave_rewards::ContentSite> site) = 0;

virtual void RemoveRecurringTipUI(const std::string& publisher_key) = 0;
virtual void GetRecurringTipsUI(GetRecurringTipsCallback callback) = 0;
virtual void GetOneTimeTipsUI(GetOneTimeTipsCallback callback) = 0;
virtual void RemoveRecurringTip(const std::string& publisher_key) = 0;
virtual void GetRecurringTips(GetRecurringTipsCallback callback) = 0;
virtual void GetOneTimeTips(GetOneTimeTipsCallback callback) = 0;
virtual void SetPublisherExclude(
const std::string& publisher_key,
bool exclude) = 0;
virtual RewardsNotificationService* GetNotificationService() const = 0;
virtual void SetBackupCompleted() = 0;
virtual void GetAutoContributeProps(
const GetAutoContributePropsCallback& callback) = 0;
virtual void GetPendingContributionsTotalUI(
virtual void GetPendingContributionsTotal(
const GetPendingContributionsTotalCallback& callback) = 0;
virtual void GetRewardsMainEnabled(
const GetRewardsMainEnabledCallback& callback) const = 0;
Expand Down Expand Up @@ -252,11 +252,11 @@ class RewardsService : public KeyedService {
const std::string& publisher_key,
RefreshPublisherCallback callback) = 0;

virtual void GetPendingContributionsUI(
virtual void GetPendingContributions(
GetPendingContributionsCallback callback) = 0;

virtual void RemovePendingContributionUI(const uint64_t id) = 0;
virtual void RemoveAllPendingContributionsUI() = 0;
virtual void RemovePendingContribution(const uint64_t id) = 0;
virtual void RemoveAllPendingContributions() = 0;
virtual void ResetTheWholeState(
const base::Callback<void(bool)>& callback) = 0;

Expand All @@ -265,9 +265,10 @@ class RewardsService : public KeyedService {

static void RegisterProfilePrefs(PrefRegistrySimple* registry);

virtual void SaveRecurringTipUI(const std::string& publisher_key,
const double amount,
SaveRecurringTipCallback callback) = 0;
virtual void SaveRecurringTip(
const std::string& publisher_key,
const double amount,
SaveRecurringTipCallback callback) = 0;

virtual const RewardsNotificationService::RewardsNotificationsMap&
GetAllNotifications() = 0;
Expand Down
Loading

0 comments on commit 26d3a5c

Please sign in to comment.