Merge pull request #8220 from brave/rewards-fix-crash-starting-rewards

Onboarding should start process if necessary

Author: emerick

browser/brave_rewards/android/brave_rewards_native_worker.cc

@@ -271,8 +271,7 @@ void BraveRewardsNativeWorker::StartProcess(JNIEnv* env) {
   }
 }
 
-void BraveRewardsNativeWorker::OnStartProcess(
-    const ledger::type::Result result) {
+void BraveRewardsNativeWorker::OnStartProcess() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BraveRewardsNativeWorker_OnStartProcess(
       env, weak_java_brave_rewards_native_worker_.get(env));

browser/brave_rewards/android/brave_rewards_native_worker.h

@@ -214,14 +214,17 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
         JNIEnv* env,
         bool isAutoContributeEnabled);
     void StartProcess(JNIEnv* env);
-    void OnStartProcess(const ledger::type::Result result);
+
  private:
     std::string StdStrStrMapToJsonString(
         const base::flat_map<std::string, std::string>& args);
 
     void OnBalance(
         const ledger::type::Result result,
         ledger::type::BalancePtr balance);
+
+    void OnStartProcess();
+
     JavaObjectWeakGlobalRef weak_java_brave_rewards_native_worker_;
     brave_rewards::RewardsService* brave_rewards_service_;
     ledger::type::RewardsParameters parameters_;

browser/extensions/api/brave_rewards_api.cc

@@ -313,29 +313,20 @@ ExtensionFunction::ResponseAction BraveRewardsTipUserFunction::Run() {
       ->AddRewardsExtension();
 
   rewards_service->StartProcess(
-      base::BindOnce(
-          &BraveRewardsTipUserFunction::OnTipUserStartProcess,
-          this,
-          params->publisher_key));
+      base::BindOnce(&BraveRewardsTipUserFunction::OnProcessStarted, this,
+                     params->publisher_key));
 
   return RespondNow(NoArguments());
 }
 
-void BraveRewardsTipUserFunction::OnTipUserStartProcess(
-    const std::string& publisher_key,
-    ledger::type::Result result) {
-  if (result != ledger::type::Result::LEDGER_OK) {
-    Release();
-    return;
-  }
-
+void BraveRewardsTipUserFunction::OnProcessStarted(
+    const std::string& publisher_key) {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   auto* rewards_service = RewardsServiceFactory::GetForProfile(profile);
   if (!rewards_service) {
     Release();
     return;
   }
-
   rewards_service->GetPublisherInfo(
       publisher_key,
       base::Bind(&BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo,
@@ -677,15 +668,15 @@ ExtensionFunction::ResponseAction BraveRewardsSaveAdsSettingFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   RewardsService* rewards_service =
       RewardsServiceFactory::GetForProfile(profile);
-  AdsService* ads_service_ = AdsServiceFactory::GetForProfile(profile);
+  AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
 
-  if (!rewards_service || !ads_service_) {
+  if (!rewards_service || !ads_service) {
     return RespondNow(Error("Service is not initialized"));
   }
 
   if (params->key == "adsEnabled") {
     const auto is_enabled =
-        params->value == "true" && ads_service_->IsSupportedLocale();
+        params->value == "true" && ads_service->IsSupportedLocale();
     rewards_service->SetAdsEnabled(is_enabled);
   }
 
@@ -1105,14 +1096,14 @@ BraveRewardsGetAdsEnabledFunction::
 ExtensionFunction::ResponseAction
 BraveRewardsGetAdsEnabledFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  AdsService* ads_service_ =
+  AdsService* ads_service =
       AdsServiceFactory::GetForProfile(profile);
 
-  if (!ads_service_) {
+  if (!ads_service) {
     return RespondNow(Error("Ads service is not initialized"));
   }
 
-  const bool enabled = ads_service_->IsEnabled();
+  const bool enabled = ads_service->IsEnabled();
   return RespondNow(OneArgument(base::Value(enabled)));
 }
 
@@ -1122,16 +1113,16 @@ BraveRewardsGetAdsAccountStatementFunction::
 ExtensionFunction::ResponseAction
 BraveRewardsGetAdsAccountStatementFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  AdsService* ads_service_ =
+  AdsService* ads_service =
       AdsServiceFactory::GetForProfile(profile);
 
-  if (!ads_service_) {
+  if (!ads_service) {
     return RespondNow(Error("Ads service is not initialized"));
   }
 
   AddRef();  // Balanced in OnGetAdsAccountStatement().
 
-  ads_service_->GetAccountStatement(base::BindOnce(
+  ads_service->GetAccountStatement(base::BindOnce(
       &BraveRewardsGetAdsAccountStatementFunction::OnGetAdsAccountStatement,
       this));
   return RespondLater();
@@ -1170,14 +1161,14 @@ BraveRewardsGetAdsSupportedFunction::
 ExtensionFunction::ResponseAction
 BraveRewardsGetAdsSupportedFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  AdsService* ads_service_ =
+  AdsService* ads_service =
       AdsServiceFactory::GetForProfile(profile);
 
-  if (!ads_service_) {
+  if (!ads_service) {
     return RespondNow(Error("Ads service is not initialized"));
   }
 
-  const bool supported = ads_service_->IsSupportedLocale();
+  const bool supported = ads_service->IsSupportedLocale();
   return RespondNow(OneArgument(base::Value(supported)));
 }
 

browser/extensions/api/brave_rewards_api.h

@@ -102,9 +102,7 @@ class BraveRewardsTipUserFunction : public ExtensionFunction {
   ResponseAction Run() override;
 
  private:
-  void OnTipUserStartProcess(
-      const std::string& publisher_key,
-      ledger::type::Result result);
+  void OnProcessStarted(const std::string& publisher_key);
   void OnTipUserGetPublisherInfo(
       const ledger::type::Result result,
       ledger::type::PublisherInfoPtr info);

components/brave_ads/browser/ads_service_impl_unittest.cc

@@ -238,7 +238,7 @@ class MockRewardsService : public RewardsService {
 
   MOCK_METHOD1(CreateWallet, void(brave_rewards::CreateWalletCallback));
 
-  MOCK_METHOD1(StartProcess, void(brave_rewards::StartProcessCallback));
+  MOCK_METHOD1(StartProcess, void(base::OnceClosure));
 
   MOCK_METHOD1(GetWalletPassphrase,
                void(brave_rewards::GetWalletPassphraseCallback));

components/brave_new_tab_ui/containers/newTab/index.tsx

@@ -389,8 +389,7 @@ class NewTabPage extends React.Component<Props, State> {
   }
 
   startRewards = () => {
-    chrome.braveRewards.saveAdsSetting('adsEnabled', 'true')
-    chrome.braveRewards.setAutoContributeEnabled(true)
+    chrome.braveRewards.saveOnboardingResult('opted-in')
   }
 
   dismissBrandedWallpaperNotification = (isUserAction: boolean) => {

components/brave_rewards/browser/rewards_service.h

@@ -130,9 +130,6 @@ using GetEventLogsCallback =
 using GetBraveWalletCallback =
     base::OnceCallback<void(ledger::type::BraveWalletPtr wallet)>;
 
-using StartProcessCallback =
-    base::OnceCallback<void(ledger::type::Result result)>;
-
 using GetWalletPassphraseCallback = base::Callback<void(const std::string&)>;
 
 enum class OnboardingResult {
@@ -365,7 +362,7 @@ class RewardsService : public KeyedService {
 
   virtual void GetBraveWallet(GetBraveWalletCallback callback) = 0;
 
-  virtual void StartProcess(StartProcessCallback callback) = 0;
+  virtual void StartProcess(base::OnceClosure callback) = 0;
 
   virtual void GetWalletPassphrase(GetWalletPassphraseCallback callback) = 0;