Remove unlimited storage

src/_locales/en_US/messages.json

@@ -67,6 +67,10 @@
         "message": "Report an Error",
         "description": ""
     },
+    "extension_error_text": {
+        "message": "Please <a href='https://www.eff.org/privacybadger#faq-I-found-a-bug!-What-do-I-do-now?' target='_blank'>tell us</a> about the following error:",
+        "description": "Shown in the popup when there is a problem with the user's Privacy Badger extension that we want to encourage the user to tell us about."
+    },
     "whitelist_form_domain_input_placeholder": {
         "message": "e.g. www.domain.com, *.domain.net, domain.org",
         "description": "Placeholder text for the Add domain input under the Whitelisted Domains tab on the options page."

src/js/background.js

@@ -584,6 +584,12 @@ Badger.prototype = {
         return;
       }
 
+      if (badger.error) {
+        chrome.browserAction.setBadgeBackgroundColor({tabId: tab_id, color: "#cc0000"});
+        chrome.browserAction.setBadgeText({tabId: tab_id, text: "!"});
+        return;
+      }
+
       // don't show the counter for any of these:
       // - the counter is disabled
       // - we don't have tabData for whatever reason (special browser pages)
@@ -602,7 +608,7 @@ Badger.prototype = {
       if (count === 0) {
         chrome.browserAction.setBadgeBackgroundColor({tabId: tab_id, color: "#00cc00"});
       } else {
-        chrome.browserAction.setBadgeBackgroundColor({tabId: tab_id, color: "#cc0000"});
+        chrome.browserAction.setBadgeBackgroundColor({tabId: tab_id, color: "#ec9329"});
       }
 
       chrome.browserAction.setBadgeText({tabId: tab_id, text: count + ""});

src/js/popup.js

@@ -89,6 +89,11 @@ function showNagMaybe() {
         _showNag();
       }
     });
+  } else if (badger.error) {
+    $('#instruction-text').hide();
+    $('#error-text').show().find('a').attr('id', 'firstRun').css('padding', '5px');
+    $('#error-message').text(badger.error);
+    _showNag();
   }
 }
 

src/js/storage.js

@@ -516,10 +516,18 @@ BadgerStorage.prototype = {
 var _syncStorage = (function () {
   var debouncedFuncs = {};
 
+  function cb() {
+    if (chrome.runtime.lastError) {
+      let err = chrome.runtime.lastError.message;
+      badger.error = err;
+      console.error("Error writing to chrome.storage.local:", err);
+    }
+  }
+
   function sync(badgerStorage) {
     var obj = {};
     obj[badgerStorage.name] = badgerStorage._store;
-    chrome.storage.local.set(obj);
+    chrome.storage.local.set(obj, cb);
   }
 
   // Creates debounced versions of "sync" function,

src/manifest.json

@@ -17,8 +17,7 @@
     "webNavigation",
     "storage",
     "cookies",
-    "privacy",
-    "unlimitedStorage"
+    "privacy"
   ],
   "background": {
     "scripts": [

src/skin/popup.html

@@ -38,15 +38,21 @@
   <div id="instruction-outer">
   </div>
   <div id="instruction" class="overlay">
-    <img src='/icons/badger-48.png'>
+    <img id="instruction-logo" src='/icons/badger-48.png'>
     <svg id="fittslaw" width="30" height="30" fill="white">
       <line x1="5" y1="5" x2="20" y2="20" style="stroke:rgb(22,22,22);stroke-width:3;fill:transparent"/>
       <line x1="5" y1="20" x2="20" y2="5" style="stroke:rgb(22,22,22);stroke-width:3;fill:transparent"/>
     </svg>
-    <p class="i18n_intro_text"></p>
-    <br>
-    <div id="firstRun">
-      <p class="i18n_first_run_text"></p>
+    <div id="instruction-text">
+        <p class="i18n_intro_text"></p>
+        <br>
+        <div id="firstRun">
+          <p class="i18n_first_run_text"></p>
+        </div>
+    </div>
+    <div id="error-text" style="display:none">
+        <p><span class="i18n_extension_error_text"></span></p>
+        <p style="color:#cc0000" id="error-message"></p>
     </div>
   </div>
   <div id="overlay" class="overlay">