Merge pull request #6305 from /issues/11044

Fixes Brave Ads intermittently crashes for thumbs up, thumbs down, opt-in, out-out, save ad and flag ad
brave · Aug 1, 2020 · f968e8e · f968e8e
2 parents fdb0bd1 + cf8b658
commit f968e8e
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
@@ -408,6 +408,10 @@ void AdsServiceImpl::ToggleAdThumbUp(
  const std::string& creative_set_id,
  const int action,
  OnToggleAdThumbUpCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleAdThumbUp(creative_instance_id, creative_set_id, action,
  base::BindOnce(&AdsServiceImpl::OnToggleAdThumbUp, AsWeakPtr(),
  std::move(callback)));
@@ -418,6 +422,10 @@ void AdsServiceImpl::ToggleAdThumbDown(
  const std::string& creative_set_id,
  const int action,
  OnToggleAdThumbDownCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleAdThumbDown(creative_instance_id, creative_set_id, action,
  base::BindOnce(&AdsServiceImpl::OnToggleAdThumbDown, AsWeakPtr(),
  std::move(callback)));
@@ -427,6 +435,10 @@ void AdsServiceImpl::ToggleAdOptInAction(
  const std::string& category,
  const int action,
  OnToggleAdOptInActionCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleAdOptInAction(category, action,
  base::BindOnce(&AdsServiceImpl::OnToggleAdOptInAction, AsWeakPtr(),
  std::move(callback)));
@@ -436,6 +448,10 @@ void AdsServiceImpl::ToggleAdOptOutAction(
  const std::string& category,
  const int action,
  OnToggleAdOptOutActionCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleAdOptOutAction(category, action,
  base::BindOnce(&AdsServiceImpl::OnToggleAdOptOutAction, AsWeakPtr(),
  std::move(callback)));
@@ -446,6 +462,10 @@ void AdsServiceImpl::ToggleSaveAd(
  const std::string& creative_set_id,
  const bool saved,
  OnToggleSaveAdCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleSaveAd(creative_instance_id, creative_set_id, saved,
  base::BindOnce(&AdsServiceImpl::OnToggleSaveAd, AsWeakPtr(),
  std::move(callback)));
@@ -456,6 +476,10 @@ void AdsServiceImpl::ToggleFlagAd(
  const std::string& creative_set_id,
  const bool flagged,
  OnToggleFlagAdCallback callback) {
+ if (!connected()) {
+ return;
+ }
+
  bat_ads_->ToggleFlagAd(creative_instance_id, creative_set_id, flagged,
  base::BindOnce(&AdsServiceImpl::OnToggleFlagAd, AsWeakPtr(),
  std::move(callback)));