From 096f65d9df1912d613cdcdee83920a3aea0856cd Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Tue, 18 Dec 2018 16:40:22 -0500 Subject: [PATCH] To be reverted: Hide HTTPSE UI and disable HTTPSE shield --- .../Frontend/Browser/HomePanel/BraveShieldStatsView.swift | 2 +- Client/Frontend/ContentBlocker/BlocklistName.swift | 6 +++--- Client/Frontend/Settings/SettingsViewController.swift | 2 +- Client/Frontend/Shields/ShieldsView.swift | 4 ++-- Client/Frontend/Shields/ShieldsViewController.swift | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Client/Frontend/Browser/HomePanel/BraveShieldStatsView.swift b/Client/Frontend/Browser/HomePanel/BraveShieldStatsView.swift index 1ac7879a1..feaa4fcc1 100644 --- a/Client/Frontend/Browser/HomePanel/BraveShieldStatsView.swift +++ b/Client/Frontend/Browser/HomePanel/BraveShieldStatsView.swift @@ -35,7 +35,7 @@ class BraveShieldStatsView: UIView, Themeable { }() lazy var stats: [StatView] = { - return [self.adsStatView, self.httpsStatView, self.timeStatView] + return [self.adsStatView/*, self.httpsStatView*/, self.timeStatView] }() override init(frame: CGRect) { diff --git a/Client/Frontend/ContentBlocker/BlocklistName.swift b/Client/Frontend/ContentBlocker/BlocklistName.swift index 5fa50a7fb..a3174dbf0 100644 --- a/Client/Frontend/ContentBlocker/BlocklistName.swift +++ b/Client/Frontend/ContentBlocker/BlocklistName.swift @@ -55,9 +55,9 @@ class BlocklistName: Hashable, CustomStringConvertible, ContentBlocker { // TODO #159: Setup image shield - if domain.isShieldExpected(.HTTPSE) { - onList.formUnion([.https]) - } +// if domain.isShieldExpected(.HTTPSE) { +// onList.formUnion([.https]) +// } return (onList, allLists.subtracting(onList)) } diff --git a/Client/Frontend/Settings/SettingsViewController.swift b/Client/Frontend/Settings/SettingsViewController.swift index 139c809ef..e03491e16 100644 --- a/Client/Frontend/Settings/SettingsViewController.swift +++ b/Client/Frontend/Settings/SettingsViewController.swift @@ -233,7 +233,7 @@ class SettingsViewController: TableViewController { header: .title(Strings.Brave_Shield_Defaults), rows: [ BoolRow(title: Strings.Block_Ads_and_Tracking, option: Preferences.Shields.blockAdsAndTracking), - BoolRow(title: Strings.HTTPS_Everywhere, option: Preferences.Shields.httpsEverywhere), +// BoolRow(title: Strings.HTTPS_Everywhere, option: Preferences.Shields.httpsEverywhere), BoolRow(title: Strings.Block_Phishing_and_Malware, option: Preferences.Shields.blockPhishingAndMalware), BoolRow(title: Strings.Block_Scripts, option: Preferences.Shields.blockScripts), BoolRow(title: Strings.Fingerprinting_Protection, option: Preferences.Shields.fingerprintingProtection), diff --git a/Client/Frontend/Shields/ShieldsView.swift b/Client/Frontend/Shields/ShieldsView.swift index 66dbd08d6..9b1c4606f 100644 --- a/Client/Frontend/Shields/ShieldsView.swift +++ b/Client/Frontend/Shields/ShieldsView.swift @@ -151,7 +151,7 @@ extension ShieldsViewController { addArrangedSubview(hostLabel) addArrangedSubview(statsHeaderLabel) setCustomSpacing(15.0, after: statsHeaderLabel) - let statViews = [adsTrackersStatView, httpsUpgradesStatView, scriptsBlockedStatView, fingerprintingStatView] + let statViews = [adsTrackersStatView/*, httpsUpgradesStatView*/, scriptsBlockedStatView, fingerprintingStatView] statViews.forEach { addArrangedSubview($0) if $0 !== statViews.last { @@ -163,7 +163,7 @@ extension ShieldsViewController { addArrangedSubview(settingsDivider) addArrangedSubview(settingsHeaderLabel) - [adsTrackersControl, httpsUpgradesControl, blockMalwareControl, blockScriptsControl, fingerprintingControl].forEach { + [adsTrackersControl/*, httpsUpgradesControl*/, blockMalwareControl, blockScriptsControl, fingerprintingControl].forEach { addArrangedSubview($0) setCustomSpacing(18.0, after: $0) } diff --git a/Client/Frontend/Shields/ShieldsViewController.swift b/Client/Frontend/Shields/ShieldsViewController.swift index 197f6a645..3b1b169da 100644 --- a/Client/Frontend/Shields/ShieldsViewController.swift +++ b/Client/Frontend/Shields/ShieldsViewController.swift @@ -74,7 +74,7 @@ class ShieldsViewController: UIViewController, PopoverContentComponent { private func updateShieldBlockStats() { shieldsView.shieldsContainerStackView.adsTrackersStatView.valueLabel.text = String(tab.contentBlocker.stats.adCount + tab.contentBlocker.stats.trackerCount) - shieldsView.shieldsContainerStackView.httpsUpgradesStatView.valueLabel.text = String(tab.contentBlocker.stats.httpsCount) +// shieldsView.shieldsContainerStackView.httpsUpgradesStatView.valueLabel.text = String(tab.contentBlocker.stats.httpsCount) shieldsView.shieldsContainerStackView.scriptsBlockedStatView.valueLabel.text = String(tab.contentBlocker.stats.scriptCount) shieldsView.shieldsContainerStackView.fingerprintingStatView.valueLabel.text = String(tab.contentBlocker.stats.fingerprintingCount) } @@ -122,7 +122,7 @@ class ShieldsViewController: UIViewController, PopoverContentComponent { (.AdblockAndTp, shieldsView.shieldsContainerStackView.adsTrackersControl, Preferences.Shields.blockAdsAndTracking), (.SafeBrowsing, shieldsView.shieldsContainerStackView.blockMalwareControl, Preferences.Shields.blockPhishingAndMalware), (.NoScript, shieldsView.shieldsContainerStackView.blockScriptsControl, Preferences.Shields.blockScripts), - (.HTTPSE, shieldsView.shieldsContainerStackView.httpsUpgradesControl, Preferences.Shields.httpsEverywhere), +// (.HTTPSE, shieldsView.shieldsContainerStackView.httpsUpgradesControl, Preferences.Shields.httpsEverywhere), (.FpProtection, shieldsView.shieldsContainerStackView.fingerprintingControl, Preferences.Shields.fingerprintingProtection), ]