Issue 189 - Implement API changes from #117, #153, #192 in Chrome

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 41 matching lines @@
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 RegExpFilter.typeMap.MEDIA = RegExpFilter.typeMap.FONT = RegExpFilter.typeMap.OTHER;
 
 // Chrome on Linux does not fully support chrome.notifications until version 35
 // https://code.google.com/p/chromium/issues/detail?id=291485
 var canUseChromeNotifications = require("info").platform == "chromium"
   && "notifications" in chrome
   && (navigator.platform.indexOf("Linux") == -1 || parseInt(require("info").applicationVersion) > 34);
 
-var isFirstRun = false;
 var seenDataCorruption = false;
 require("filterNotifier").FilterNotifier.addListener(function(action)
 {
   if (action == "load")
   {
     var importingOldData = importOldData();

[Thomas Greiner, 2014/04/15 12:53:07]

Since we can now distinguish first-run from update what about running
importOldData only on update?

[Wladimir Palant, 2014/04/15 13:31:53]

I'd rather not polish this code, it isn't worth the risk - removing it should be
a better idea. I created https://issues.adblockplus.org/ticket/331 for this.

 
     var addonVersion = require("info").addonVersion;
     var prevVersion = ext.storage.currentVersion;
-    if (prevVersion != addonVersion)
+    if (prevVersion != addonVersion || FilterStorage.firstRun)
     {
-      isFirstRun = !prevVersion;
+      seenDataCorruption = prevVersion && FilterStorage.firstRun;
       ext.storage.currentVersion = addonVersion;
       if (!importingOldData)
         addSubscription(prevVersion);
     }
 
     if (canUseChromeNotifications)
       initChromeNotifications();
     initAntiAdblockNotification();
   }
 
@@ skipping 229 matching lines @@
   activeNotification.onClicked = function()
   {
     if (animateIcon)
       iconAnimation.stop();
     notificationClosed();
   };
   if (animateIcon)
     iconAnimation.update(activeNotification.type);
 }
 
-function openNotificationLinks() 
+function openNotificationLinks()
 {
   if (activeNotification.links)
   {
     activeNotification.links.forEach(function(link)
     {
       ext.windows.getLastFocused(function(win)
       {
         win.openTab(Utils.getDocLink(link));
       });
     });
@@ skipping 59 matching lines @@
     clearActiveNotification(notificationId);
   });
   chrome.notifications.onClicked.addListener(clearActiveNotification);
   chrome.notifications.onClosed.addListener(notificationClosed);
 }
 
 function showNotification(notification)
 {
   if (activeNotification && activeNotification.id === notification.id)
     return;
-  
+
   activeNotification = notification;
   if (activeNotification.type === "critical" || activeNotification.type === "question")
   {
     var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
     if (hasWebkitNotifications && "createHTMLNotification" in webkitNotifications)
     {
       var notification = webkitNotifications.createHTMLNotification("notification.html");
       notification.show();
       prepareNotificationIconAndPopup();
       return;
     }
-    
+
     var texts = Notification.getLocalizedTexts(notification);
     var title = texts.title || "";
     var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
     var iconUrl = ext.getURL("icons/abp-128.png");
     var hasLinks = activeNotification.links && activeNotification.links.length > 0;
-    
+
     if (canUseChromeNotifications)
     {
       var opts = {
         type: "basic",
         title: title,
         message: message,
         buttons: [],
         priority: 2 // We use the highest priority to prevent the notification from closing automatically
       };
       if (activeNotification.type === "question")
       {
         opts.buttons.push({title: ext.i18n.getMessage("overlay_notification_button_yes")});
         opts.buttons.push({title: ext.i18n.getMessage("overlay_notification_button_no")});
       }
       else
       {
         var regex = /<a>(.*?)<\/a>/g;
         var plainMessage = texts.message || "";
         var match;
         while (match = regex.exec(plainMessage))
           opts.buttons.push({title: match[1]});
       }
-      
+
       imgToBase64(iconUrl, function(iconData)
       {
         opts["iconUrl"] = iconData;
         chrome.notifications.create("", opts, function() {});
       });
     }
     else if (hasWebkitNotifications && "createNotification" in webkitNotifications && activeNotification.type !== "question")
     {
       if (hasLinks)
         message += " " + ext.i18n.getMessage("notification_without_buttons");
 
       imgToBase64(iconUrl, function(iconData)
       {
         var notification = webkitNotifications.createNotification(iconData, title, message);
         notification.show();
         notification.addEventListener("click", openNotificationLinks, false);
         notification.addEventListener("close", notificationClosed, false);
       });
     }
     else
     {
       var message = title + "\n" + message;
       if (hasLinks)
         message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
-        
+
       var approved = confirm(message);
       if (activeNotification.type === "question")
         notificationButtonClick(approved ? 0 : 1);
       else if (approved)
         openNotificationLinks();
     }
   }
   prepareNotificationIconAndPopup();
 }
 
@@ skipping 97 matching lines @@
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);