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

Make AccountManager.shared actually call init.

Browse Source
This commit is contained in:
Brent Simmons 2024-07-07 16:31:59 -07:00
parent c784569040
commit 44a9a52705
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Account/Sources/Account/AccountManager.swift
View File

@ -15,7 +15,7 @@ import Core
@MainActor public final class AccountManager: UnreadCountProvider {
@MainActor public static var shared: AccountManager!
@MainActor public static var shared = AccountManager()
public static let netNewsWireNewsURL = "https://netnewswire.blog/feed.xml"
private static let jsonNetNewsWireNewsURL = "https://netnewswire.blog/feed.json"

5
Modules/Account/Sources/Account/DataExtensions.swift
View File

@ -50,10 +50,7 @@ public extension Article {
@MainActor var account: Account? {
// The force unwrapped shared instance was crashing Account.framework unit tests.
guard let manager = AccountManager.shared else {
return nil
}
return manager.existingAccount(with: accountID)
return AccountManager.shared.existingAccount(with: accountID)
}
@MainActor var feed: Feed? {

4
Modules/ArticleExtractor/Sources/ArticleExtractor/ArticleExtractor.swift
View File

@ -18,7 +18,7 @@ public enum ArticleExtractorState: Sendable {
case cancelled
}
public protocol ArticleExtractorDelegate {
public protocol ArticleExtractorDelegate: AnyObject {
@MainActor func articleExtractionDidFail(with: Error)
@MainActor func articleExtractionDidComplete(extractedArticle: ExtractedArticle)
@ -28,7 +28,7 @@ public protocol ArticleExtractorDelegate {
public var state: ArticleExtractorState!
public var article: ExtractedArticle?
public var delegate: ArticleExtractorDelegate?
public weak var delegate: ArticleExtractorDelegate?
public let articleLink: String?
private var dataTask: URLSessionDataTask? = nil