Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #8566: Remove ScreenTime temporarily. #8568

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Fix #8566: Remove ScreenTime temporarily. #8568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/Brave/Frontend/Browser/BrowserViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ public class BrowserViewController: UIViewController {
}

if Preferences.Privacy.screenTimeEnabled.value {
screenTimeViewController = STWebpageController()
// Enable once fixed, ref #8566
//screenTimeViewController = STWebpageController()
}
}

Expand Down Expand Up @@ -3306,7 +3307,8 @@ extension BrowserViewController: PreferencesObserver {
recordAdsUsageType()
case Preferences.Privacy.screenTimeEnabled.key:
if Preferences.Privacy.screenTimeEnabled.value {
screenTimeViewController = STWebpageController()
// Enable once fixed, ref #8566
//screenTimeViewController = STWebpageController()
iccub marked this conversation as resolved.
Show resolved Hide resolved
if let tab = tabManager.selectedTab {
recordScreenTimeUsage(for: tab)
}
Expand Down
3 changes: 3 additions & 0 deletions ...ces/Brave/Frontend/Settings/Features/ShieldsPrivacy/OtherPrivacySettingsSectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down