Unified Diff: adblockplus/issue-6108.patch
Issue 29863604:
Issue 6865 - Update ABP dependency to version 3.2 (Closed)
Patch Set: Adjusting build script and removing extension first run page
Created Jan. 8, 2019, 2:54 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« adblockplus/extensionBridge.js ('K')
|
« adblockplus/issue-6070.patch ('k')
|
adblockplus/issue-6865.patch » ('j')
|
mobile/android/base/java/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: adblockplus/issue-6108.patch |
| =================================================================== |
| deleted file mode 100644 |
| --- a/adblockplus/issue-6108.patch |
| +++ /dev/null |
| @@ -1,42 +0,0 @@ |
| -Issue 6108 - No filter list is selected after a migration failure |
| - |
| -diff --git a/lib/filterStorage.js b/lib/filterStorage.js |
| ---- a/lib/filterStorage.js |
| -+++ b/lib/filterStorage.js |
| -@@ -43,16 +43,18 @@ let formatVersion = 5; |
| - let FilterStorage = exports.FilterStorage = |
| - { |
| - /** |
| - * Will be set to true after the initial loadFromDisk() call completes. |
| - * @type {boolean} |
| - */ |
| - initialized: false, |
| - |
| -+ loadFromDiskFailed: false, |
| -+ |
| - /** |
| - * Version number of the patterns.ini format used. |
| - * @type {number} |
| - */ |
| - get formatVersion() |
| - { |
| - return formatVersion; |
| - }, |
| -@@ -398,16 +400,17 @@ let FilterStorage = exports.FilterStorag |
| - { |
| - return this.restoreBackup(backupIndex, true).then(() => |
| - { |
| - if (this.subscriptions.length == 0) |
| - return tryBackup(backupIndex + 1); |
| - }).catch(error => |
| - { |
| - // Give up |
| -+ this.loadFromDiskFailed = true; |
| - }); |
| - }; |
| - |
| - return IO.statFile(this.sourceFile).then(statData => |
| - { |
| - if (!statData.exists) |
| - { |
| - this.firstRun = true; |
