Merge pull request #4931 from /issues/8640

Removed setting for conversion/attribution confirmation

Author: tmancey

browser/extensions/api/brave_rewards_api.cc

@@ -608,8 +608,6 @@ ExtensionFunction::ResponseAction BraveRewardsSaveAdsSettingFunction::Run() {
       const auto is_enabled =
           params->value == "true" && ads_service_->IsSupportedLocale();
       ads_service_->SetEnabled(is_enabled);
-    } else if (params->key == "shouldAllowAdConversionTracking") {
-      ads_service_->SetAllowAdConversionTracking(params->value == "true");
     }
   }
   return RespondNow(NoArguments());

browser/ui/webui/brave_rewards_page_ui.cc

@@ -306,9 +306,6 @@ class RewardsDOMHandler : public WebUIMessageHandler,
 
 namespace {
 
-const char kShouldAllowAdConversionTracking[] =
-    "shouldAllowAdConversionTracking";
-
 const int kDaysOfAdsHistory = 7;
 
 }  // namespace
@@ -1100,11 +1097,6 @@ void RewardsDOMHandler::GetAdsData(const base::ListValue *args) {
   auto is_enabled = ads_service_->IsEnabled();
   ads_data.SetBoolean("adsEnabled", is_enabled);
 
-  const auto should_allow_ad_conversion_tracking =
-      ads_service_->ShouldAllowAdConversionTracking();
-  ads_data.SetBoolean(kShouldAllowAdConversionTracking,
-      should_allow_ad_conversion_tracking);
-
   auto ads_per_hour = ads_service_->GetAdsPerHour();
   ads_data.SetInteger("adsPerHour", ads_per_hour);
 
@@ -1325,8 +1317,6 @@ void RewardsDOMHandler::SaveAdsSetting(const base::ListValue* args) {
     const auto is_enabled =
         value == "true" && ads_service_->IsSupportedLocale();
     ads_service_->SetEnabled(is_enabled);
-  } else if (key == kShouldAllowAdConversionTracking) {
-    ads_service_->SetAllowAdConversionTracking(value == "true");
   } else if (key == "adsPerHour") {
     ads_service_->SetAdsPerHour(std::stoull(value));
   }

browser/ui/webui/brave_webui_source.cc

@@ -259,8 +259,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
       }
     }, {
       std::string("rewards"), {
-        { "adsAllowConversionTracking",  IDS_BRAVE_REWARDS_LOCAL_ADS_ALLOW_CONVERSION_TRACKING },  // NOLINT
-        { "adsAllowConversionTrackingDescription",  IDS_BRAVE_REWARDS_LOCAL_ADS_ALLOW_CONVERSION_TRACKING_DESCRIPTION },  // NOLINT
         { "adsCurrentEarnings",  IDS_BRAVE_REWARDS_LOCAL_ADS_CURRENT_EARNINGS },
         { "adsDesc",  IDS_BRAVE_REWARDS_LOCAL_ADS_DESC },
         { "adsDisabledTextOne",  IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_ONE },                // NOLINT

components/brave_rewards/resources/android_page/components/adsBox.tsx

@@ -9,7 +9,7 @@ import { connect } from 'react-redux'
 // Components
 import BoxMobile, { Props as BoxMobileProps } from '../../ui/components/mobile/boxMobile'
 import { List, NextContribution, Tokens } from '../../ui/components'
-import { Grid, Column, Select, ControlWrapper, Checkbox } from 'brave-ui/components'
+import { Grid, Column, Select, ControlWrapper } from 'brave-ui/components'
 import AdsOnboarding from './adsOnboarding'
 import {
   StyledListContent,
@@ -31,12 +31,10 @@ class AdsBox extends React.Component<Props, {}> {
 
   onAdsSettingChange = (key: string, value: boolean) => {
     let newValue: any = value
-    const { adsEnabled, shouldAllowAdConversionTracking } = this.props.rewardsData.adsData
+    const { adsEnabled } = this.props.rewardsData.adsData
 
     if (key === 'adsEnabled') {
       newValue = !adsEnabled
-    } else if (key === 'shouldAllowAdConversionTracking') {
-      newValue = !shouldAllowAdConversionTracking
     }
 
     this.props.actions.onAdsSettingSave(key, newValue)
@@ -47,7 +45,7 @@ class AdsBox extends React.Component<Props, {}> {
       return null
     }
 
-    const { adsPerHour, shouldAllowAdConversionTracking } = this.props.rewardsData.adsData
+    const { adsPerHour } = this.props.rewardsData.adsData
 
     return (
       <Grid columns={1} customStyle={{ maxWidth: '270px', margin: '0 auto' }}>
@@ -66,18 +64,6 @@ class AdsBox extends React.Component<Props, {}> {
               })}
             </Select>
           </ControlWrapper>
-          <ControlWrapper text={getLocale('adsOtherSettings')}>
-            <Checkbox
-              value={{
-                shouldAllowAdConversionTracking: shouldAllowAdConversionTracking
-              }}
-              multiple={true}
-              onChange={this.onAdsSettingChange}
-            >
-              <div data-key='shouldAllowAdConversionTracking'>{getLocale('adsAllowConversionTracking')}</div>
-            </Checkbox>
-            <div>{getLocale('adsAllowConversionTrackingDescription')}</div>
-          </ControlWrapper>
         </Column>
       </Grid>
     )

components/brave_rewards/resources/android_page/reducers/rewards_reducer.ts

@@ -124,7 +124,6 @@ const rewardsReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State
       }
 
       state.adsData.adsEnabled = action.payload.adsData.adsEnabled
-      state.adsData.shouldAllowAdConversionTracking = action.payload.adsData.shouldAllowAdConversionTracking
       state.adsData.adsPerHour = action.payload.adsData.adsPerHour
       state.adsData.adsUIEnabled = action.payload.adsData.adsUIEnabled
       state.adsData.adsIsSupported = action.payload.adsData.adsIsSupported

components/brave_rewards/resources/android_page/storage.ts

@@ -48,7 +48,6 @@ export const defaultState: Rewards.State = {
   tipsLoad: false,
   adsData: {
     adsEnabled: false,
-    shouldAllowAdConversionTracking: false,
     adsPerHour: 0,
     adsUIEnabled: false,
     adsIsSupported: false,

components/brave_rewards/resources/page/components/adsBox.tsx

@@ -17,7 +17,7 @@ import {
   ShowAdsHistory,
   Tokens
 } from '../../ui/components'
-import { Grid, Column, Select, ControlWrapper, Checkbox } from 'brave-ui/components'
+import { Grid, Column, Select, ControlWrapper } from 'brave-ui/components'
 
 // Utils
 import * as utils from '../utils'
@@ -78,12 +78,10 @@ class AdsBox extends React.Component<Props, State> {
 
   onAdsSettingChange = (key: string, value: boolean) => {
     let newValue: any = value
-    const { adsEnabled, shouldAllowAdConversionTracking } = this.props.rewardsData.adsData
+    const { adsEnabled } = this.props.rewardsData.adsData
 
     if (key === 'adsEnabled') {
       newValue = !adsEnabled
-    } else if (key === 'shouldAllowAdConversionTracking') {
-      newValue = !shouldAllowAdConversionTracking
     }
 
     this.props.actions.onAdsSettingSave(key, newValue)
@@ -94,7 +92,7 @@ class AdsBox extends React.Component<Props, State> {
       return null
     }
 
-    const { adsPerHour, shouldAllowAdConversionTracking } = this.props.rewardsData.adsData
+    const { adsPerHour } = this.props.rewardsData.adsData
 
     return (
       <Grid columns={1} customStyle={{ margin: '0 auto' }}>
@@ -113,18 +111,6 @@ class AdsBox extends React.Component<Props, State> {
               })}
             </Select>
           </ControlWrapper>
-          <ControlWrapper text={getLocale('adsOtherSettings')}>
-            <Checkbox
-              value={{
-                shouldAllowAdConversionTracking: shouldAllowAdConversionTracking
-              }}
-              multiple={true}
-              onChange={this.onAdsSettingChange}
-            >
-              <div data-key='shouldAllowAdConversionTracking'>{getLocale('adsAllowConversionTracking')}</div>
-            </Checkbox>
-            <div>{getLocale('adsAllowConversionTrackingDescription')}</div>
-          </ControlWrapper>
         </Column>
       </Grid>
     )

components/brave_rewards/resources/page/reducers/rewards_reducer.ts

@@ -124,7 +124,6 @@ const rewardsReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State
       }
 
       state.adsData.adsEnabled = action.payload.adsData.adsEnabled
-      state.adsData.shouldAllowAdConversionTracking = action.payload.adsData.shouldAllowAdConversionTracking
       state.adsData.adsPerHour = action.payload.adsData.adsPerHour
       state.adsData.adsUIEnabled = action.payload.adsData.adsUIEnabled
       state.adsData.adsIsSupported = action.payload.adsData.adsIsSupported

components/brave_rewards/resources/page/storage.ts

@@ -48,7 +48,6 @@ export const defaultState: Rewards.State = {
   tipsLoad: false,
   adsData: {
     adsEnabled: false,
-    shouldAllowAdConversionTracking: false,
     adsPerHour: 0,
     adsUIEnabled: false,
     adsIsSupported: false,

components/definitions/rewards.d.ts

@@ -217,7 +217,6 @@ declare namespace Rewards {
 
   export interface AdsData {
     adsEnabled: boolean
-    shouldAllowAdConversionTracking: boolean
     adsPerHour: number
     adsUIEnabled: boolean
     adsIsSupported: boolean

components/resources/brave_components_strings.grd

@@ -224,8 +224,6 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DESC" desc="">Earn {{currency}} by viewing Brave Ads. Ads presented are based on your interests, as inferred from your browsing behavior. No personal data or browsing history ever leaves your browser.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_TITLE" desc="">Auto-Contribute</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_DESC" desc="">An automatic way to support publishers and content creators. Set a monthly payment and browse normally. The Brave Verified sites you visit will receive your contributions automatically, based on your attention as measured by Brave.</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_ALLOW_CONVERSION_TRACKING" desc="">Allow ad conversion detection</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_ALLOW_CONVERSION_TRACKING_DESCRIPTION" desc="">This will anonymously let Brave know that there was a response to an ad on this browser. Enabling this will increase earnings.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_CURRENT_EARNINGS" desc="">Estimated pending rewards</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_PAYMENT_DATE" desc="">Next payment date</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_NOTIFICATIONS_RECEIVED" desc="">Ad notifications received this month</message>

components/test/brave_rewards/page/reducers/rewards_reducer_test.ts

@@ -95,7 +95,6 @@ describe('rewards reducer', () => {
         const initState: Rewards.State = { ...defaultState }
         initState.adsData = {
           adsEnabled: false,
-          shouldAllowAdConversionTracking: true,
           adsPerHour: 2,
           adsUIEnabled: false,
           adsIsSupported: false,
@@ -107,7 +106,6 @@ describe('rewards reducer', () => {
         const expectedState: Rewards.State = { ...defaultState }
         expectedState.adsData = {
           adsEnabled: true,
-          shouldAllowAdConversionTracking: true,
           adsPerHour: 5,
           adsUIEnabled: true,
           adsIsSupported: true,
@@ -123,7 +121,6 @@ describe('rewards reducer', () => {
           payload: {
             adsData: {
               adsEnabled: true,
-              shouldAllowAdConversionTracking: true,
               adsPerHour: 5,
               adsUIEnabled: true,
               adsIsSupported: true
@@ -142,7 +139,6 @@ describe('rewards reducer', () => {
         const expectedState: Rewards.State = { ...defaultState }
         expectedState.adsData = {
           adsEnabled: false,
-          shouldAllowAdConversionTracking: true,
           adsPerHour: 2,
           adsUIEnabled: true,
           adsIsSupported: true,
@@ -158,7 +154,6 @@ describe('rewards reducer', () => {
           payload: {
             adsData: {
               adsEnabled: false,
-              shouldAllowAdConversionTracking: true,
               adsPerHour: 2,
               adsUIEnabled: true,
               adsIsSupported: true

vendor/brave-ios/Ads/BATBraveAds.h

@@ -76,9 +76,6 @@ NS_SWIFT_NAME(BraveAds)
 /// Whether or not Brave Ads is enabled
 @property (nonatomic, assign, getter=isEnabled) BOOL enabled;
 
-/// Whether or not the user has opted out of conversion tracking
-@property (nonatomic, assign, getter=shouldAllowAdConversionTracking) BOOL allowAdConversionTracking;
-
 /// The max number of ads the user can see in an hour
 @property (nonatomic, assign) NSInteger numberOfAllowableAdsPerHour NS_SWIFT_NAME(adsPerHour);
 

vendor/brave-ios/Ads/BATBraveAds.mm

@@ -25,12 +25,10 @@
   + (__type)__objc_getter { return ads::__cpp_var; } \
   + (void)__objc_setter:(__type)newValue { ads::__cpp_var = newValue; }
 
-static const NSInteger kDefaultAllowAdConversionTracking = YES;
 static const NSInteger kDefaultNumberOfAdsPerDay = 20;
 static const NSInteger kDefaultNumberOfAdsPerHour = 2;
 
 static NSString * const kAdsEnabledPrefKey = @"BATAdsEnabled";
-static NSString * const kShouldAllowAdConversionTrackingPrefKey = @"BATShouldAllowAdConversionTracking";
 static NSString * const kNumberOfAdsPerDayKey = @"BATNumberOfAdsPerDay";
 static NSString * const kNumberOfAdsPerHourKey = @"BATNumberOfAdsPerHour";
 
@@ -65,7 +63,6 @@ - (instancetype)initWithStateStoragePath:(NSString *)path
     self.prefs = [[NSMutableDictionary alloc] initWithContentsOfFile:[self prefsPath]];
     if (!self.prefs) {
       self.prefs = [[NSMutableDictionary alloc] init];
-      self.allowAdConversionTracking = kDefaultAllowAdConversionTracking;
       self.numberOfAllowableAdsPerDay = kDefaultNumberOfAdsPerDay;
       self.numberOfAllowableAdsPerHour = kDefaultNumberOfAdsPerHour;
     }
@@ -176,13 +173,7 @@ - (void)setEnabled:(BOOL)enabled
 
 - (BOOL)shouldAllowAdConversionTracking
 {
-  return [(NSNumber *)self.prefs[kShouldAllowAdConversionTrackingPrefKey] boolValue];
-}
-
-- (void)setAllowAdConversionTracking:(BOOL)shouldAllowAdConversionTracking
-{
-  self.prefs[kShouldAllowAdConversionTrackingPrefKey] = @(shouldAllowAdConversionTracking);
-  [self savePrefs];
+  return true;
 }
 
 - (NSInteger)numberOfAllowableAdsPerDay

vendor/brave-ios/tests/ads_wrapper_test.mm

@@ -61,14 +61,12 @@ - (void)testPreferencePersistance
 {
   const auto expect = [self expectationWithDescription:@"File IO"];
   self.ads.enabled = NO;
-  self.ads.allowAdConversionTracking = YES;
   self.ads.numberOfAllowableAdsPerDay = 10;
   self.ads.numberOfAllowableAdsPerHour = 6;
 
   dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
     BATBraveAds *secondAds = [[BATBraveAds alloc] initWithStateStoragePath:[self stateStoragePath]];
     XCTAssertEqual(self.ads.enabled, secondAds.enabled);
-    XCTAssertEqual(self.ads.shouldAllowAdConversionTracking, secondAds.shouldAllowAdConversionTracking);
     XCTAssertEqual(self.ads.numberOfAllowableAdsPerDay, secondAds.numberOfAllowableAdsPerDay);
     XCTAssertEqual(self.ads.numberOfAllowableAdsPerHour, secondAds.numberOfAllowableAdsPerHour);