From 48347897ad3184da45587fe651ae3a62688bde8b Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 21 Jul 2019 11:00:14 -0400
Subject: [PATCH] Remove obsolete `ublock-resources`-related code

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/679
---
 src/js/assets.js  | 19 +------------------
 src/js/storage.js |  4 ----
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/js/assets.js b/src/js/assets.js
index f4aa76d99..07700f073 100644
--- a/src/js/assets.js
+++ b/src/js/assets.js
@@ -930,22 +930,9 @@ const updaterFetched = new Set();
 
 let updaterStatus,
     updaterTimer,
-    updaterAssetDelay = updaterAssetDelayDefault,
-    noRemoteResources;
+    updaterAssetDelay = updaterAssetDelayDefault;
 
 const updateFirst = function() {
-    // https://github.com/gorhill/uBlock/commit/126110c9a0a0630cd556f5cb215422296a961029
-    //   Firefox extension reviewers do not want uBO/webext to fetch its own
-    //   scriptlets/resources asset from the project's own repo (github.com).
-    // https://github.com/uBlockOrigin/uAssets/issues/1647#issuecomment-371456830
-    //   Allow self-hosted dev build to update: if update_url is present but
-    //   null, assume the extension is hosted on AMO.
-    if ( noRemoteResources === undefined ) {
-        noRemoteResources =
-            vAPI.webextFlavor.soup.has('firefox') &&
-            vAPI.webextFlavor.soup.has('webext') &&
-            vAPI.webextFlavor.soup.has('devbuild') === false;
-    }
     updaterStatus = 'updating';
     updaterFetched.clear();
     updaterUpdated.length = 0;
@@ -977,10 +964,6 @@ const updateNext = function() {
             ) {
                 continue;
             }
-            // Update of user scripts/resources forbidden?
-            if ( assetKey === 'ublock-resources' && noRemoteResources ) {
-                continue;
-            }
             if (
                 fireNotification(
                     'before-asset-updated',
diff --git a/src/js/storage.js b/src/js/storage.js
index c63961741..73a7b5851 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -1330,10 +1330,6 @@
                 return;
             }
         }
-        // This asset is deprecated.
-        if ( details.assetKey === 'ublock-resources' ) {
-            return;
-        }
         return true;
     }