Merge pull request #158 from OneNoteDev/feature/remove-notifications

Remove notifications and permissions

Author: leakymemory

src/scripts/extensions/chrome/manifest.json

@@ -24,7 +24,6 @@
 		"<all_urls>",
 		"activeTab",
 		"contextMenus",
-		"notifications",
 		"tabs",
 		"webRequest",
 		"webRequestBlocking",

src/scripts/extensions/webExtensionBase/webExtensionNotifications.ts

@@ -1,20 +1,20 @@
-import {WebExtension} from "./webExtension";
+// import {WebExtension} from "./webExtension";
 
-type ButtonListener = (notificationId: string, buttonIndex: number) => void;
+// type ButtonListener = (notificationId: string, buttonIndex: number) => void;
 
-export class WebExtensionNotifications {
-	private static buttonListener: ButtonListener;
+// export class WebExtensionNotifications {
+// 	private static buttonListener: ButtonListener;
 
-	public static setButtonListener(buttonListener: ButtonListener): void {
-		WebExtensionNotifications.removeButtonListener();
-		WebExtensionNotifications.buttonListener = buttonListener;
-		WebExtension.browser.notifications.onButtonClicked.addListener(buttonListener);
-	}
+// 	public static setButtonListener(buttonListener: ButtonListener): void {
+// 		WebExtensionNotifications.removeButtonListener();
+// 		WebExtensionNotifications.buttonListener = buttonListener;
+// 		WebExtension.browser.notifications.onButtonClicked.addListener(buttonListener);
+// 	}
 
-	public static removeButtonListener(): void {
-		if (WebExtensionNotifications.buttonListener) {
-			WebExtension.browser.notifications.onButtonClicked.removeListener(WebExtensionNotifications.buttonListener);
-			WebExtensionNotifications.buttonListener = undefined;
-		}
-	}
-}
+// 	public static removeButtonListener(): void {
+// 		if (WebExtensionNotifications.buttonListener) {
+// 			WebExtension.browser.notifications.onButtonClicked.removeListener(WebExtensionNotifications.buttonListener);
+// 			WebExtensionNotifications.buttonListener = undefined;
+// 		}
+// 	}
+// }

src/scripts/extensions/webExtensionBase/webExtensionWorker.ts

@@ -26,7 +26,7 @@ import {InvokeSource} from "../invokeSource";
 import {InjectUrls} from "./injectUrls";
 import {WebExtension} from "./webExtension";
 import {WebExtensionBackgroundMessageHandler} from "./webExtensionMessageHandler";
-import {WebExtensionNotifications} from "./webExtensionNotifications";
+// import {WebExtensionNotifications} from "./webExtensionNotifications";
 
 type Tab = chrome.tabs.Tab;
 type TabRemoveInfo = chrome.tabs.TabRemoveInfo;
@@ -100,32 +100,33 @@ export class WebExtensionWorker extends ExtensionWorkerBase<W3CTab, number> {
 						clientInfo: this.clientInfo
 					});
 
-					// The ability to get a store link from the url is only available to Chrome so far (as of 10/21/16)
-					let extensionUrlRegex = /^chrome-extension:\/\/(\w+)\W/;
-					if (this.clientInfo.get().clipperType === ClientType.ChromeExtension && extensionUrlRegex.test(this.tab.url)) {
-						let extensionId = this.tab.url.match(extensionUrlRegex)[1];
-						let extensionUrl = "https://chrome.google.com/webstore/detail/" + extensionId;
-
-						WebExtensionNotifications.setButtonListener((notificationId, buttonIndex) => {
-							if (notificationId === Constants.Extension.NotificationIds.conflictingExtension && buttonIndex === 0) {
-								window.open(extensionUrl);
-								WebExtension.browser.notifications.clear(Constants.Extension.NotificationIds.conflictingExtension);
-							}
-						});
-
-						WebExtension.browser.notifications.create(Constants.Extension.NotificationIds.conflictingExtension, {
-							type: "basic",
-							title: Localization.getLocalizedString("WebClipper.Label.OneNoteWebClipper"),
-							message: Localization.getLocalizedString("WebClipper.Error.ConflictingExtension"),
-							buttons: [{ title: extensionUrl }],
-							iconUrl: "icons/icon-256.png"
-						});
-					} else {
-						// In Firefox, alert() is not callable from the background, so it looks like we have to no-op here
-						if (this.clientInfo.get().clipperType !== ClientType.FirefoxExtension) {
-							InjectHelper.alertUserOfUnclippablePage();
-						}
+					// // The ability to get a store link from the url is only available to Chrome so far (as of 10/21/16)
+					// let extensionUrlRegex = /^chrome-extension:\/\/(\w+)\W/;
+					// if (this.clientInfo.get().clipperType === ClientType.ChromeExtension && extensionUrlRegex.test(this.tab.url)) {
+					// 	let extensionId = this.tab.url.match(extensionUrlRegex)[1];
+					// 	let extensionUrl = "https://chrome.google.com/webstore/detail/" + extensionId;
+
+					// 	WebExtensionNotifications.setButtonListener((notificationId, buttonIndex) => {
+					// 		if (notificationId === Constants.Extension.NotificationIds.conflictingExtension && buttonIndex === 0) {
+					// 			window.open(extensionUrl);
+					// 			WebExtension.browser.notifications.clear(Constants.Extension.NotificationIds.conflictingExtension);
+					// 		}
+					// 	});
+
+					// 	WebExtension.browser.notifications.create(Constants.Extension.NotificationIds.conflictingExtension, {
+					// 		type: "basic",
+					// 		title: Localization.getLocalizedString("WebClipper.Label.OneNoteWebClipper"),
+					// 		message: Localization.getLocalizedString("WebClipper.Error.ConflictingExtension"),
+					// 		buttons: [{ title: extensionUrl }],
+					// 		iconUrl: "icons/icon-256.png"
+					// 	});
+					// } else {
+
+					// In Firefox, alert() is not callable from the background, so it looks like we have to no-op here
+					if (this.clientInfo.get().clipperType !== ClientType.FirefoxExtension) {
+						InjectHelper.alertUserOfUnclippablePage();
 					}
+					// }
 					resolve(false);
 				} else {
 					WebExtension.browser.tabs.executeScript(this.tab.id, { file: this.injectUrls.webClipperInjectUrl });