FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reconcile with 6.1.6-ios branch.

Browse Source
This commit is contained in:
Brent Simmons 2025-01-03 11:48:19 -08:00
parent 56678a77f5
commit 62ad4d6e3b
3 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
iOS/AppDelegate.swift
View File

@ -11,7 +11,7 @@ import RSCore
import RSWeb import RSWeb
import Account import Account
import BackgroundTasks import BackgroundTasks
import os.log import os
import Secrets import Secrets
import WidgetKit import WidgetKit
@ -36,17 +36,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
} }
} }
var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "Application")
var userNotificationManager: UserNotificationManager! var userNotificationManager: UserNotificationManager!
var faviconDownloader: FaviconDownloader! var faviconDownloader: FaviconDownloader!
var imageDownloader: ImageDownloader!
var authorAvatarDownloader: AuthorAvatarDownloader!
var feedIconDownloader: FeedIconDownloader!
var extensionContainersFile: ExtensionContainersFile! var extensionContainersFile: ExtensionContainersFile!
var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile! var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile!
var widgetDataEncoder: WidgetDataEncoder! var widgetDataEncoder: WidgetDataEncoder!
var unreadCount = 0 { var unreadCount = 0 {
didSet { didSet {
if unreadCount != oldValue { if unreadCount != oldValue {
@ -82,7 +79,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
let isFirstRun = AppDefaults.shared.isFirstRun let isFirstRun = AppDefaults.shared.isFirstRun
if isFirstRun { if isFirstRun {
os_log("Is first run.", log: log, type: .info) logger.info("Is first run.")
} }
if isFirstRun && !AccountManager.shared.anyAccountHasAtLeastOneFeed() { if isFirstRun && !AccountManager.shared.anyAccountHasAtLeastOneFeed() {
@ -114,9 +111,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
extensionFeedAddRequestFile = ExtensionFeedAddRequestFile() extensionFeedAddRequestFile = ExtensionFeedAddRequestFile()
widgetDataEncoder = WidgetDataEncoder() widgetDataEncoder = WidgetDataEncoder()
syncTimer = ArticleStatusSyncTimer() syncTimer = ArticleStatusSyncTimer()
#if DEBUG #if DEBUG
syncTimer!.update() syncTimer!.update()
#endif #endif
@ -167,7 +164,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
func resumeDatabaseProcessingIfNecessary() { func resumeDatabaseProcessingIfNecessary() {
if AccountManager.shared.isSuspended { if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll() AccountManager.shared.resumeAll()
os_log("Application processing resumed.", log: self.log, type: .info) logger.info("Application processing resumed.")
} }
} }
@ -179,7 +176,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
widgetDataEncoder.encode() widgetDataEncoder.encode()
waitForSyncTasksToFinish() waitForSyncTasksToFinish()
} }
func prepareAccountsForForeground() { func prepareAccountsForForeground() {
extensionFeedAddRequestFile.resume() extensionFeedAddRequestFile.resume()
syncTimer?.update() syncTimer?.update()
@ -230,24 +227,15 @@ private extension AppDelegate {
let tempDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! let tempDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
let faviconsFolderURL = tempDir.appendingPathComponent("Favicons") let faviconsFolderURL = tempDir.appendingPathComponent("Favicons")
let imagesFolderURL = tempDir.appendingPathComponent("Images") let imagesFolderURL = tempDir.appendingPathComponent("Images")
try! FileManager.default.createDirectory(at: faviconsFolderURL, withIntermediateDirectories: true, attributes: nil) try! FileManager.default.createDirectory(at: faviconsFolderURL, withIntermediateDirectories: true, attributes: nil)
let faviconsFolder = faviconsFolderURL.absoluteString let faviconsFolder = faviconsFolderURL.absoluteString
let faviconsFolderPath = faviconsFolder.suffix(from: faviconsFolder.index(faviconsFolder.startIndex, offsetBy: 7)) let faviconsFolderPath = faviconsFolder.suffix(from: faviconsFolder.index(faviconsFolder.startIndex, offsetBy: 7))
faviconDownloader = FaviconDownloader(folder: String(faviconsFolderPath)) faviconDownloader = FaviconDownloader(folder: String(faviconsFolderPath))
let imagesFolder = imagesFolderURL.absoluteString
let imagesFolderPath = imagesFolder.suffix(from: imagesFolder.index(imagesFolder.startIndex, offsetBy: 7))
try! FileManager.default.createDirectory(at: imagesFolderURL, withIntermediateDirectories: true, attributes: nil) try! FileManager.default.createDirectory(at: imagesFolderURL, withIntermediateDirectories: true, attributes: nil)
imageDownloader = ImageDownloader(folder: String(imagesFolderPath))
authorAvatarDownloader = AuthorAvatarDownloader(imageDownloader: imageDownloader)
let tempFolder = tempDir.absoluteString
let tempFolderPath = tempFolder.suffix(from: tempFolder.index(tempFolder.startIndex, offsetBy: 7))
feedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: String(tempFolderPath))
} }
private func initializeHomeScreenQuickActions() { private func initializeHomeScreenQuickActions() {
let unreadTitle = NSLocalizedString("First Unread", comment: "First Unread") let unreadTitle = NSLocalizedString("First Unread", comment: "First Unread")
let unreadIcon = UIApplicationShortcutIcon(systemImageName: "chevron.down.circle") let unreadIcon = UIApplicationShortcutIcon(systemImageName: "chevron.down.circle")
@ -278,7 +266,7 @@ private extension AppDelegate {
self.waitBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask { [weak self] in self.waitBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask { [weak self] in
guard let self = self else { return } guard let self = self else { return }
self.completeProcessing(true) self.completeProcessing(true)
os_log("Accounts wait for progress terminated for running too long.", log: self.log, type: .info) logger.info("Accounts wait for progress terminated for running too long.")
} }
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
@ -290,18 +278,18 @@ private extension AppDelegate {
func waitToComplete(completion: @escaping (Bool) -> Void) { func waitToComplete(completion: @escaping (Bool) -> Void) {
guard UIApplication.shared.applicationState == .background else { guard UIApplication.shared.applicationState == .background else {
os_log("App came back to foreground, no longer waiting.", log: self.log, type: .info) logger.info("App came back to foreground, no longer waiting.")
completion(false) completion(false)
return return
} }
if AccountManager.shared.refreshInProgress || isSyncArticleStatusRunning || widgetDataEncoder.isRunning { if AccountManager.shared.refreshInProgress || isSyncArticleStatusRunning || widgetDataEncoder.isRunning {
os_log("Waiting for sync to finish...", log: self.log, type: .info) logger.info("Waiting for sync to finish…")
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
self?.waitToComplete(completion: completion) self?.waitToComplete(completion: completion)
} }
} else { } else {
os_log("Refresh progress complete.", log: self.log, type: .info) logger.info("Refresh progress complete.")
completion(true) completion(true)
} }
} }
@ -328,7 +316,7 @@ private extension AppDelegate {
self.syncBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask { self.syncBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask {
completeProcessing() completeProcessing()
os_log("Accounts sync processing terminated for running too long.", log: self.log, type: .info) self.logger.info("Accounts sync processing terminated for running too long.")
} }
DispatchQueue.main.async { DispatchQueue.main.async {
@ -352,7 +340,7 @@ private extension AppDelegate {
} }
} }
os_log("Application processing suspended.", log: self.log, type: .info) logger.info("Application processing suspended.")
} }
} }
@ -380,7 +368,7 @@ private extension AppDelegate {
do { do {
try BGTaskScheduler.shared.submit(request) try BGTaskScheduler.shared.submit(request)
} catch { } catch {
os_log(.error, log: self.log, "Could not schedule app refresh: %@", error.localizedDescription) self.logger.error("Could not schedule app refresh: \(error.localizedDescription)")
} }
} }
} }
@ -389,10 +377,10 @@ private extension AppDelegate {
/// - Parameter task: `BGAppRefreshTask` /// - Parameter task: `BGAppRefreshTask`
/// - Warning: As of Xcode 11 beta 2, when triggered from the debugger this doesn't work. /// - Warning: As of Xcode 11 beta 2, when triggered from the debugger this doesn't work.
func performBackgroundFeedRefresh(with task: BGAppRefreshTask) { func performBackgroundFeedRefresh(with task: BGAppRefreshTask) {
scheduleBackgroundFeedRefresh() // schedule next refresh scheduleBackgroundFeedRefresh() // schedule next refresh
os_log("Woken to perform account refresh.", log: self.log, type: .info) logger.info("Woken to perform account refresh.")
DispatchQueue.main.async { DispatchQueue.main.async {
if AccountManager.shared.isSuspended { if AccountManager.shared.isSuspended {
@ -401,22 +389,21 @@ private extension AppDelegate {
AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) { [unowned self] in AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) { [unowned self] in
if !AccountManager.shared.isSuspended { if !AccountManager.shared.isSuspended {
self.suspendApplication() self.suspendApplication()
os_log("Account refresh operation completed.", log: self.log, type: .info) logger.info("Account refresh operation completed.")
task.setTaskCompleted(success: true) task.setTaskCompleted(success: true)
} }
} }
} }
// set expiration handler // set expiration handler
task.expirationHandler = { [weak task] in task.expirationHandler = { [weak task] in
os_log("Accounts refresh processing terminated for running too long.", log: self.log, type: .info) self.logger.info("Accounts refresh processing terminated for running too long.")
DispatchQueue.main.async { DispatchQueue.main.async {
self.suspendApplication() self.suspendApplication()
task?.setTaskCompleted(success: false) task?.setTaskCompleted(success: false)
} }
} }
} }
} }
// Handle Notification Actions // Handle Notification Actions

2
iOS/Article/PreloadedWebView.swift
View File

@ -13,7 +13,7 @@ class PreloadedWebView: WKWebView {
private var isReady: Bool = false private var isReady: Bool = false
private var readyCompletion: (() -> Void)? private var readyCompletion: (() -> Void)?
init(articleIconSchemeHandler: ArticleIconSchemeHandler) { init(articleIconSchemeHandler: ArticleIconSchemeHandler) {
let preferences = WKPreferences() let preferences = WKPreferences()
preferences.javaScriptCanOpenWindowsAutomatically = false preferences.javaScriptCanOpenWindowsAutomatically = false

15
iOS/Article/WebViewController.swift
View File

@ -273,8 +273,7 @@ class WebViewController: UIViewController {
if AppDefaults.shared.useSystemBrowser { if AppDefaults.shared.useSystemBrowser {
UIApplication.shared.open(url, options: [:]) UIApplication.shared.open(url, options: [:])
} else { } else {
let vc = SFSafariViewController(url: url) openURLInSafariViewController(url)
present(vc, animated: true)
} }
} }
} }
@ -378,8 +377,7 @@ extension WebViewController: WKNavigationDelegate {
guard didOpen == false else { guard didOpen == false else {
return return
} }
let vc = SFSafariViewController(url: url) self.openURLInSafariViewController(url)
self.present(vc, animated: true)
} }
} }
@ -595,7 +593,6 @@ private extension WebViewController {
let html = try! MacroProcessor.renderedText(withTemplate: ArticleRenderer.page.html, substitutions: substitutions) let html = try! MacroProcessor.renderedText(withTemplate: ArticleRenderer.page.html, substitutions: substitutions)
webView.loadHTMLString(html, baseURL: ArticleRenderer.page.baseURL) webView.loadHTMLString(html, baseURL: ArticleRenderer.page.baseURL)
} }
func finalScrollPosition(scrollingUp: Bool) -> CGFloat { func finalScrollPosition(scrollingUp: Bool) -> CGFloat {
@ -794,11 +791,15 @@ private extension WebViewController {
guard didOpen == false else { guard didOpen == false else {
return return
} }
let vc = SFSafariViewController(url: url) self.openURLInSafariViewController(url)
self.present(vc, animated: true)
} }
} }
func openURLInSafariViewController(_ url: URL) {
let viewController = SFSafariViewController(url: url)
present(viewController, animated: true)
}
} }
// MARK: Find in Article // MARK: Find in Article