Fix #752: Add HTTPSE file version preference to be upgradable with app

brave · Jan 18, 2019 · 3fe6b52 · 3fe6b52
1 parent 23b1355
commit 3fe6b52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/BraveShared/Preferences.swift b/BraveShared/Preferences.swift
@@ -56,6 +56,7 @@ extension Preferences {
     }
     public final class BlockFileVersion {
         public static let adblock = Option<String?>(key: "blockfile.adblock", default: nil)
+        public static let httpse = Option<String?>(key: "blockfile.httpse", default: nil)
     }
 }
 

diff --git a/Client/Frontend/ContentBlocker/BlocklistName.swift b/Client/Frontend/ContentBlocker/BlocklistName.swift
@@ -30,14 +30,18 @@ class BlocklistName: Hashable, CustomStringConvertible, ContentBlocker {
         return "<\(type(of: self)): \(self.filename)>"
     }
 
+    private static let blocklistFileVersionMap: [BlocklistName: Preferences.Option<String?>] = [
+        BlocklistName.ad: Preferences.BlockFileVersion.adblock,
+        BlocklistName.https: Preferences.BlockFileVersion.httpse
+    ]
+
     lazy var fileVersionPref: Preferences.Option<String?>? = {
-        let prefMap = [BlocklistName.ad: Preferences.BlockFileVersion.adblock]
-        return prefMap[self]
+        return BlocklistName.blocklistFileVersionMap[self]
     }()
 
     lazy var fileVersion: String? = {
-        let adVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
-        return self == .ad ? adVersion : nil
+        guard let _ = BlocklistName.blocklistFileVersionMap[self] else { return nil }
+        return Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
     }()
 
     static func blocklists(forDomain domain: Domain) -> (on: Set<BlocklistName>, off: Set<BlocklistName>) {