Merge branch 'main' into custom-time-skip-duration
This commit is contained in:
commit
b61acd6744
|
@ -27,11 +27,6 @@ final class ConnectToServerViewModel: ViewModel {
|
||||||
@Published var servers: [ServerDiscovery.ServerLookupResponse] = []
|
@Published var servers: [ServerDiscovery.ServerLookupResponse] = []
|
||||||
@Published var searching = false
|
@Published var searching = false
|
||||||
|
|
||||||
override init() {
|
|
||||||
super.init()
|
|
||||||
getPublicUsers()
|
|
||||||
}
|
|
||||||
|
|
||||||
func getPublicUsers() {
|
func getPublicUsers() {
|
||||||
if ServerEnvironment.current.server != nil {
|
if ServerEnvironment.current.server != nil {
|
||||||
LogManager.shared.log.debug("Attempting to read public users from \(ServerEnvironment.current.server.baseURI!)", tag: "getPublicUsers")
|
LogManager.shared.log.debug("Attempting to read public users from \(ServerEnvironment.current.server.baseURI!)", tag: "getPublicUsers")
|
||||||
|
|
|
@ -14,7 +14,7 @@ import JellyfinAPI
|
||||||
|
|
||||||
class ViewModel: ObservableObject {
|
class ViewModel: ObservableObject {
|
||||||
|
|
||||||
@Published var isLoading = true
|
@Published var isLoading = false
|
||||||
@Published var errorMessage: ErrorMessage?
|
@Published var errorMessage: ErrorMessage?
|
||||||
|
|
||||||
let loading = ActivityIndicator()
|
let loading = ActivityIndicator()
|
||||||
|
|
Loading…
Reference in New Issue