Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-1831 Disable Rewards by default on Firefox #437

Merged
merged 4 commits into from Aug 22, 2019
+3 −3
Merged

GH-1831 Disable Rewards by default on Firefox #437

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c8a55b
Disable Rewards by default on Firefox
wlycdgr Aug 20, 2019
91b4e2e
Merge branch 'develop' into GH-1831/make-rewards-opt-in-on-FF
wlycdgr Aug 22, 2019
bdc2a65
Make sure Rewards is not activated on FF install in background
wlycdgr Aug 22, 2019
b69b60b
Merge branch 'develop' into GH-1831/make-rewards-opt-in-on-FF
christophertino Aug 22, 2019
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

2 app/hub/Views/SetupView/SetupViewContainer.jsx
View file
Open in desktop
@@ -104,7 +104,7 @@ class SetupViewContainer extends Component {
this.props.actions.setAntiTracking({ enable_anti_tracking: true });
this.props.actions.setAdBlock({ enable_ad_block: true });
this.props.actions.setSmartBlocking({ enable_smart_block: true });
this.props.actions.setGhosteryRewards({ enable_ghostery_rewards: true });
this.props.actions.setGhosteryRewards({ enable_ghostery_rewards: !IS_FIREFOX });
This conversation was marked as resolved by wlycdgr

This comment has been minimized.

Sign in to view
@Eden12345

Eden12345 Aug 20, 2019
Contributor

This isn't your code at all, so I will approve this PR, but I want to take this opportunity to express my sadness about calling this action via _setDefaultSettings() in the constructor() of this component.

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Aug 21, 2019
Author Member

I want to take this opportunity to express that I share your sadness.
this.props.actions.setHumanWeb({ enable_human_web: !IS_FIREFOX });
}

2 src/background.js
View file
Open in desktop
@@ -1759,7 +1759,7 @@ function initializeGhosteryModules() {
conf.enable_ad_block = !adblocker.isDisabled;
conf.enable_anti_tracking = !antitracking.isDisabled;
conf.enable_human_web = !humanweb.isDisabled && !(IS_FIREFOX && globals.JUST_INSTALLED);
conf.enable_offers = !offers.isDisabled;
conf.enable_offers = !offers.isDisabled && !(IS_FIREFOX && globals.JUST_INSTALLED);
}
}
});
2 src/classes/ConfData.js
View file
Open in desktop
@@ -107,7 +107,7 @@ class ConfData {
_initProperty('enable_click2play_social', true);
_initProperty('enable_human_web', !IS_CLIQZ && !IS_FIREFOX);
_initProperty('enable_metrics', false);
_initProperty('enable_offers', !IS_CLIQZ);
_initProperty('enable_offers', !IS_CLIQZ && !IS_FIREFOX);
_initProperty('enable_smart_block', true);
_initProperty('expand_all_trackers', true);
_initProperty('hide_alert_trusted', false);
ProTip! Use n and p to navigate between commits in a pull request.