ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Singleton renamed

This commit is contained in:
PangMo5 2021-06-14 03:08:42 +09:00
parent f2853ba87c
commit c66fce752a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Shared/ServerEnvironment.swift
View File

@ -13,7 +13,7 @@ import Foundation
import JellyfinAPI import JellyfinAPI
final class ServerEnvironment { final class ServerEnvironment {
static let shared = ServerEnvironment() static let current = ServerEnvironment()
fileprivate(set) var server: Server! fileprivate(set) var server: Server!
init() { init() {

2
Shared/Shared/SessionManager.swift
View File

@ -15,7 +15,7 @@ import KeychainSwift
import UIKit import UIKit
final class SessionManager { final class SessionManager {
static let shared = SessionManager() static let current = SessionManager()
fileprivate(set) var user: SignedInUser! fileprivate(set) var user: SignedInUser!
fileprivate(set) var authHeader: String! fileprivate(set) var authHeader: String!
fileprivate(set) var deviceIDString: String fileprivate(set) var deviceIDString: String

12
WidgetExtension/NextUpWidget.swift
View File

@ -25,17 +25,17 @@ struct NextUpWidgetProvider: TimelineProvider {
func getSnapshot(in context: Context, completion: @escaping (NextUpEntry) -> Void) { func getSnapshot(in context: Context, completion: @escaping (NextUpEntry) -> Void) {
let currentDate = Date() let currentDate = Date()
guard let server = ServerEnvironment.shared.server else { return guard let server = ServerEnvironment.current.server else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer)) completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer))
} }
} }
guard let savedUser = SessionManager.shared.user else { return guard let savedUser = SessionManager.current.user else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser)) completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser))
} }
} }
guard let header = SessionManager.shared.authHeader else { return guard let header = SessionManager.current.authHeader else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader)) completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader))
} }
@ -80,19 +80,19 @@ struct NextUpWidgetProvider: TimelineProvider {
func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> Void) { func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> Void) {
let currentDate = Date() let currentDate = Date()
let entryDate = Calendar.current.date(byAdding: .hour, value: 1, to: currentDate)! let entryDate = Calendar.current.date(byAdding: .hour, value: 1, to: currentDate)!
guard let server = ServerEnvironment.shared.server else { return guard let server = ServerEnvironment.current.server else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer)], completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer)],
policy: .after(entryDate))) policy: .after(entryDate)))
} }
} }
guard let savedUser = SessionManager.shared.user else { return guard let savedUser = SessionManager.current.user else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser)], completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser)],
policy: .after(entryDate))) policy: .after(entryDate)))
} }
} }
guard let header = SessionManager.shared.authHeader else { return guard let header = SessionManager.current.authHeader else { return
DispatchQueue.main.async { DispatchQueue.main.async {
completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader)], completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader)],
policy: .after(entryDate))) policy: .after(entryDate)))