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.

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

Android browser develop #97

Merged
merged 6 commits into from Aug 6, 2018
Allow getting cliqzModuleData from specified tab
  • Loading branch information
mai-cliqz committed Jul 20, 2018
commit 2bd8b28e96a371632771362c0c16c16a207bd016
@@ -193,7 +193,7 @@ function closeAndroidPanelTabs() {
if (BROWSER_INFO.os !== 'android') { return; }
chrome.tabs.query({
active: true,
url: chrome.extension.getURL('app/templates/panel_android.html*')
url: chrome.extension.getURL('app/templates/panel_android_ui.html*')
}, (tabs) => {
chrome.tabs.remove(tabs.map(t => t.id));
});
@@ -680,14 +680,15 @@ function onMessageHandler(request, sender, callback) {
return false;
} else if (name === 'getCliqzModuleData') {
const modules = { adblock: {}, antitracking: {} };
utils.getActiveTab((tab) => {

const getCliqzModuleDataForTab = (tabId, callback) => {
button.update();
if (conf.enable_ad_block) {
// update adblock count. callback() handled below based on anti-tracking status
modules.adblock = cliqz.modules.adblocker.background.actions.getAdBlockInfoForTab(tab.id);
modules.adblock = cliqz.modules.adblocker.background.actions.getAdBlockInfoForTab(tabId);
}
if (conf.enable_anti_tracking) {
cliqz.modules.antitracking.background.actions.aggregatedBlockingStats(tab.id).then((data) => {
cliqz.modules.antitracking.background.actions.aggregatedBlockingStats(tabId).then((data) => {
modules.antitracking = data;
callback(modules);
}).catch((err) => {
@@ -696,7 +697,16 @@ function onMessageHandler(request, sender, callback) {
} else {
callback(modules);
}
});
};

if (message && message.tabId) {
getCliqzModuleDataForTab(+message.tabId, callback);
} else {
utils.getActiveTab((tab) => {
getCliqzModuleDataForTab(tab.id, callback);
});
}

return true;
} else if (name === 'getTrackerDescription') {
utils.getJson(message.url).then((result) => {
@@ -1227,7 +1237,7 @@ function initializePopup() {
if (BROWSER_INFO.os === 'android') {
chrome.browserAction.onClicked.addListener((tab) => {
chrome.tabs.create({
url: chrome.extension.getURL(`app/templates/panel_android.html?tabId=${tab.id}`),
url: chrome.extension.getURL(`app/templates/panel_android_ui.html?tabId=${tab.id}`),
active: true,
});
});
ProTip! Use n and p to navigate between commits in a pull request.