Merge pull request #2074.

Increase minimum Firefox version to 52.

Author: ghostwords

release-utils/post-release.sh

@@ -56,8 +56,8 @@ echo "  \"version\": \"$TARGET\","
 echo "  \"update_link\": \"https://eff.org/files/privacy-badger-eff-$TARGET.xpi\","
 echo "  \"update_hash\": \"sha256:`sha256sum $PKG | cut -c 1-64`\","
 echo "  \"applications\": {"
-echo "    \"gecko\": { \"strict_min_version\": \"50.0.2\" } "
-echo "  } "
+echo "    \"gecko\": { \"strict_min_version\": \"52.0\" }"
+echo "  }"
 echo "}"
 echo ""
 echo "Now please upload $POSTPKGCWS to the Chrome Developer Dashboard"

src/js/options.js

@@ -32,18 +32,7 @@ if (!matches || matches[1] == "Firefox") {
 
 const USER_DATA_EXPORT_KEYS = ["action_map", "snitch_map", "settings_map"];
 
-/**
- * TODO
- * @cooperq - 2016/12/05
- * This is a workaround for a bug in firefox 50.0.2 (no bugzilla id I could find)
- * This bug is fixed as of firefox 52.0 and the try/catch can be removed at that
- * time
- **/
-try {
-  var backgroundPage = chrome.extension.getBackgroundPage();
-} catch (e) {
-  location.reload();
-}
+var backgroundPage = chrome.extension.getBackgroundPage();
 var require = backgroundPage.require;
 var badger = backgroundPage.badger;
 var log = backgroundPage.log;

src/js/webrequest.js

@@ -55,12 +55,6 @@ function onBeforeRequest(details) {
   if (type == "main_frame") {
     forgetTab(tab_id);
 
-    // Firefox workaround: https://bugzilla.mozilla.org/show_bug.cgi?id=1329299
-    // TODO remove after Firefox 51 is no longer in use
-    if (frame_id != 0) {
-      frame_id = 0;
-    }
-
     badger.recordFrame(tab_id, frame_id, details.parentFrameId, url);
 
     return {};

src/manifest.json

@@ -4,7 +4,7 @@
   "applications": {
     "gecko": {
       "id": "jid1-MnnxcxisBPnSXQ@jetpack",
-      "strict_min_version": "50.0"
+      "strict_min_version": "52.0"
     }
   },
   "incognito": "spanning",