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

Commit

Permalink
Fix #7467: Add support for using component updater to fetch backgroun…
Browse files Browse the repository at this point in the history
…d & sponsored images (#7634)
  • Loading branch information
kylehickinson authored Jun 23, 2023
1 parent d922283 commit 34a90d9
Show file tree
Hide file tree
Showing 29 changed files with 142 additions and 1,640 deletions.
9 changes: 3 additions & 6 deletions App/iOS/Delegates/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -445,19 +445,16 @@ extension BrowserViewController {
let retryDeadline = Date() + retryTime

Preferences.NewTabPage.superReferrerThemeRetryDeadline.value = retryDeadline

self.backgroundDataSource
.fetchSpecificResource(.superReferral(code: code))
} else {
self.backgroundDataSource.startFetching()

// TODO: Set the code in core somehow if we want to support Super Referrals again
// then call updateSponsoredImageComponentIfNeeded
}

guard let url = offerUrl?.asURL else { return }
self.openReferralLink(url: url)
}
} else {
urp.pingIfEnoughTimePassed()
self.backgroundDataSource.startFetching()
}
}
}
Expand Down
17 changes: 1 addition & 16 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -425,22 +425,7 @@ var braveTarget: PackageDescription.Target = .target(
.copy("Frontend/Reader/Reader.css"),
.copy("Frontend/Reader/Reader.html"),
.copy("Frontend/Reader/ReaderViewLoading.html"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/ntp-data.json"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/alain_franchette_ocean.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/boris_baldinger.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/caline_beulin.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/corwin-prescott_beach.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/corwin-prescott_canyon.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/corwin-prescott_crestone.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/curt_stump_nature.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/david_malenfant_mountains.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/dylan-malval_sea.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/geran_de_klerk_forest.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/joshn_larson_desert.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/priyanuch_konkaew.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/spencer-moore_desert.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/spencer-moore_fern.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/spencer-moore_ocean.jpg"),
.copy("Frontend/Browser/New Tab Page/Backgrounds/Assets/NTP_Images/corwin-prescott-3.jpg"),
.copy("Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveSearchScript.js"),
.copy("Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveSkusScript.js"),
.copy("Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/nacl.min.js"),
Expand Down
7 changes: 2 additions & 5 deletions Sources/Brave/Frontend/Browser/BrowserViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class BrowserViewController: UIViewController {
let collapsedURLBarView = CollapsedURLBarView()

// Single data source used for all favorites vcs
public let backgroundDataSource = NTPDataSource()
public let backgroundDataSource: NTPDataSource
let feedDataSource = FeedDataSource()

private var postSetupTasks: [() -> Void] = []
Expand Down Expand Up @@ -283,6 +283,7 @@ public class BrowserViewController: UIViewController {
self.migration = migration
self.crashedLastSession = crashedLastSession
feedDataSource.historyAPI = braveCore.historyAPI
backgroundDataSource = .init(service: braveCore.backgroundImagesService)

let configuration: BraveRewards.Configuration = .current()

Expand Down Expand Up @@ -456,7 +457,6 @@ public class BrowserViewController: UIViewController {
self.updateRewardsButtonState()
self.setupAdsNotificationHandler()
}
Preferences.NewTabPage.selectedCustomTheme.observe(from: self)
Preferences.Playlist.webMediaSourceCompatibility.observe(from: self)
Preferences.PrivacyReports.captureShieldsData.observe(from: self)
Preferences.PrivacyReports.captureVPNAlerts.observe(from: self)
Expand Down Expand Up @@ -3012,9 +3012,6 @@ extension BrowserViewController: PreferencesObserver {
case Preferences.Rewards.hideRewardsIcon.key,
Preferences.Rewards.rewardsToggledOnce.key:
updateRewardsButtonState()
case Preferences.NewTabPage.selectedCustomTheme.key:
Preferences.NTP.ntpCheckDate.value = nil
backgroundDataSource.startFetching()
case Preferences.Playlist.webMediaSourceCompatibility.key:
if UIDevice.isIpad {
tabManager.allTabs.forEach {
Expand Down
42 changes: 0 additions & 42 deletions Sources/Brave/Frontend/Browser/HomePanel/CustomTheme.swift

This file was deleted.

Loading

0 comments on commit 34a90d9

Please sign in to comment.