From 386743e8b1aab8fe034bb650c45aca3a16f047b7 Mon Sep 17 00:00:00 2001 From: Dustin Mierau Date: Fri, 17 May 2024 13:59:46 -0700 Subject: Further work on bookmark syncing. Reworked code that prepopulated bookmarks when empty to wait for first sync. --- Hotline/Models/ApplicationState.swift | 2 ++ Hotline/Models/Bookmark.swift | 23 ++++------------------- 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'Hotline/Models') diff --git a/Hotline/Models/ApplicationState.swift b/Hotline/Models/ApplicationState.swift index 5814fba..6e077c5 100644 --- a/Hotline/Models/ApplicationState.swift +++ b/Hotline/Models/ApplicationState.swift @@ -11,4 +11,6 @@ final class ApplicationState { var activeServerID: UUID? = nil var activeServerBanner: NSImage? = nil var activeServerName: String? = nil + + var cloudKitReady: Bool = false } diff --git a/Hotline/Models/Bookmark.swift b/Hotline/Models/Bookmark.swift index 3530b19..c713bb0 100644 --- a/Hotline/Models/Bookmark.swift +++ b/Hotline/Models/Bookmark.swift @@ -34,6 +34,10 @@ final class Bookmark { @Transient var servers: [Bookmark] = [] + func hash(into hasher: inout Hasher) { + + } + @Transient var displayAddress: String { switch self.type { @@ -53,25 +57,6 @@ final class Bookmark { return "\(self.address):\(String(self.port))" } } - -// if let s = server { -// if s.port == HotlinePorts.DefaultServerPort { -// return s.address -// } -// else { -// return "\(s.address):\(s.port)" -// } -// } -// else if let b = bookmark { -// if b.port == HotlinePorts.DefaultServerPort { -// return b.address -// } -// else { -// return "\(b.address):\(b.port)" -// } -// } - -// return nil } @Transient -- cgit