Skip to content
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.

Sign up for GitHub

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

Get build info from chrome.management API #113

Merged
merged 16 commits into from
Jan 14, 2017
Merged

Get build info from chrome.management API #113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
74de1bb
Update IDs of the extension
tomasko126 Dec 2, 2016
6931da0
Update comment
tomasko126 Dec 2, 2016
6327c0a
Introduce CHROME const
tomasko126 Dec 6, 2016
597dcc9
Use chrome.management API for getting details, how the extension was …
tomasko126 Jan 9, 2017
4fcc270
Merge branch 'master' into build-info
tomasko126 Jan 9, 2017
0146ca3
Temporary change the version of OS X in Browserstack
tomasko126 Jan 9, 2017
42a8f2c
Change back to El Capitan
tomasko126 Jan 9, 2017
df82b74
Use chrome.runtime.getBGPage in popup.js and adreport.js
tomasko126 Jan 9, 2017
0f8136c
Support getting build info on Safari
tomasko126 Jan 10, 2017
ccb483c
Add another comment
tomasko126 Jan 10, 2017
2112561
Fix getting debug info in adreport page
tomasko126 Jan 10, 2017
2516085
Check extension ID against known extension IDs
tomasko126 Jan 11, 2017
efed18d
Add returns
tomasko126 Jan 11, 2017
c3872eb
Simplify if block
tomasko126 Jan 13, 2017
2773282
Fixed typo
tomasko126 Jan 13, 2017
2509383
Merge branch 'master' into build-info
tomasko126 Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ function getDebugInfo() {
// Is this installed build of CatBlock the official one?
// TODO: Replace ID's by getting info, how the extension was installed
function AdBlockBuild() {
if (!SAFARI && !FIREFOX) {
if (CHROME || OPERA) {
if (chrome.runtime.id === "mdcgnhlfpnbeieiiccmebgkfdebafodo" ||
chrome.runtime.id === "pejeadkbfbppoaoinpmkeonebmngpnkk") {
return "Stable";
Expand Down
3 changes: 2 additions & 1 deletion js/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Set to true to get noisier console.log statements
var VERBOSE_DEBUG = false;

// Global variable for detection of Opera, Edge and Firefox
// Global variable for browser detection
var OPERA = navigator.userAgent.indexOf("OPR") > -1;
var EDGE = navigator.userAgent.indexOf("Edge") > -1;
var FIREFOX = navigator.userAgent.indexOf("Firefox") > -1;
var CHROME = !OPERA && !EDGE && !FIREFOX && !SAFARI; // SAFARI is defined in port.js
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there really no reliable way of detecting if it's Chrome without just assuming it's the default?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpeckett This is the safest way, how to detect Chrome afaik.


// Edge uses "browser" namespace for its API
if (EDGE) {
Expand Down