From 7521d6a016a4eda9aa073b644c03b1b88deb6f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Buczek?= Date: Fri, 15 Dec 2023 01:11:16 +0100 Subject: [PATCH] Fix brave/brave-ios#8566: Remove ScreenTime temporarily. (brave/brave-ios#8568) Seems to cause UI freezes. --- Sources/Brave/Frontend/Browser/BrowserViewController.swift | 6 ++++-- .../ShieldsPrivacy/OtherPrivacySettingsSectionView.swift | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift index 013cd9cef071..e1966b89a46b 100644 --- a/Sources/Brave/Frontend/Browser/BrowserViewController.swift +++ b/Sources/Brave/Frontend/Browser/BrowserViewController.swift @@ -378,7 +378,8 @@ public class BrowserViewController: UIViewController { } if Preferences.Privacy.screenTimeEnabled.value { - screenTimeViewController = STWebpageController() + // Enable once fixed, ref #8566 + //screenTimeViewController = STWebpageController() } } @@ -3302,7 +3303,8 @@ extension BrowserViewController: PreferencesObserver { recordAdsUsageType() case Preferences.Privacy.screenTimeEnabled.key: if Preferences.Privacy.screenTimeEnabled.value { - screenTimeViewController = STWebpageController() + // Enable once fixed, ref #8566 + //screenTimeViewController = STWebpageController() if let tab = tabManager.selectedTab { recordScreenTimeUsage(for: tab) } diff --git a/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/OtherPrivacySettingsSectionView.swift b/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/OtherPrivacySettingsSectionView.swift index 201ae5e93fad..2d0658950783 100644 --- a/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/OtherPrivacySettingsSectionView.swift +++ b/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/OtherPrivacySettingsSectionView.swift @@ -69,11 +69,14 @@ struct OtherPrivacySettingsSectionView: View { subtitle: String.localizedStringWithFormat(Strings.googleSafeBrowsingUsingWebKitDescription, URL.brave.safeBrowsingHelp.absoluteString), option: Preferences.Shields.googleSafeBrowsing ) + // Enable once fixed, ref #8566 + /* OptionToggleView( title: Strings.screenTimeSetting, subtitle: String.localizedStringWithFormat(Strings.screenTimeSettingDescription, URL.brave.screenTimeHelp.absoluteString), option: Preferences.Privacy.screenTimeEnabled ) + */ ShieldToggleView( title: Strings.P3A.settingTitle, subtitle: Strings.P3A.settingSubtitle,