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

GIS-866: Search Communication #647

Merged
merged 17 commits into from Jan 7, 2021
+80 −22
Merged

GIS-866: Search Communication #647

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
653632e
add search messager class and allow calling of refreshToken
fcjr Dec 22, 2020
0985b0f
only init on gb
fcjr Dec 22, 2020
0e51222
lint fixes
fcjr Dec 23, 2020
952a9f4
add since
fcjr Dec 23, 2020
b225f58
ensure browser info is populated
fcjr Dec 24, 2020
3e28136
remove gb IS const
fcjr Jan 4, 2021
935998f
fix isRefreshing invocation
fcjr Jan 5, 2021
496448e
move to main func, use finally
fcjr Jan 5, 2021
4f90be7
move window dispatch
fcjr Jan 5, 2021
0ca6af2
handle previously unhandled fetch rejections
fcjr Jan 5, 2021
f3d3ff8
refactor to use a single promise
fcjr Jan 5, 2021
5d70dab
Merge branch 'develop' into GIS-866_search_communication
fcjr Jan 5, 2021
e49e6bc
remove old event type
fcjr Jan 5, 2021
c878115
Merge branch 'GIS-866_search_communication' of github.com:ghostery/gh…
fcjr Jan 5, 2021
d8219d2
handle refreshToken errors
fcjr Jan 5, 2021
8e7bebd
update cc
fcjr Jan 6, 2021
eea4e9d
Merge branch 'develop' into GIS-866_search_communication
jsignanini Jan 6, 2021
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

only init on gb

  • Loading branch information
@fcjr
fcjr committed Dec 22, 2020
Verified
This commit was signed with the committer’s verified signature.
fcjr Frank Chiarulli Jr.
GPG key ID: 262758B51E7A9804 Learn about vigilant mode.
commit 0985b0fac4c9d701861d2e66cc9aa316febd5c5b
9 src/background.js
View file
Open in desktop
@@ -67,6 +67,7 @@ const {
CDN_BASE_URL, BROWSER_INFO, IS_CLIQZ
} = globals;
const IS_EDGE = (BROWSER_INFO.name === 'edge');
const IS_GHOSTERY_BROWSER = (BROWSER_INFO.name === 'ghostery_desktop');
This conversation was marked as resolved by christophertino

This comment has been minimized.

Sign in to view
@christophertino

christophertino Dec 24, 2020
Member

This is asynchronous. Check out globals.BROWSER_INFO_READY instead.

This comment has been minimized.

Sign in to view
@fcjr

fcjr Dec 24, 2020 •
edited
Author Member

Ah thanks, updated to await BROWSER_INFO_READY, however I see the browser info is being used before verifying that it is populated in a few other places which we should address in another PR -- we should also probably have BROWSER_INFO_READY short circuit if once a successful call to buildBrowserInfo is completed as currently every time we await globals.BROWSER_INFO_READY we are unnecessarily recalculating these values.

This comment has been minimized.

Sign in to view
@christophertino

christophertino Jan 4, 2021
Member

Let's remove this line completely since it's evaluated at runtime and unreliable. The other browser_info checks should be working as is. The async check only applies to the desktop browser and Android browser to allow us to differentiate from stock FF.
const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
const IS_ANDROID = (BROWSER_INFO.os === 'android');
const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/version`;
@@ -1650,10 +1651,10 @@ function initializeGhosteryModules() {
}

/**
* Initialize Search Messaging.
* Initialize Search Message Handler.
* @memberOf Background
*/
function initializeSearchMessaging() {
function initializeSearchMessageHandler() {
const sm = new searchMessager();
sm.init()
}
@@ -1669,7 +1670,9 @@ function init() {
initializePopup();
initializeEventListeners();
initializeVersioning();
initializeSearchMessaging();
if (IS_GHOSTERY_BROWSER) {
initializeSearchMessageHandler();
}
return metrics.init(globals.JUST_INSTALLED).then(() => initializeGhosteryModules().then(() => {
account.migrate()
.then(() => {
ProTip! Use n and p to navigate between commits in a pull request.