Minor fixes

SagerNet · Oct 13, 2024 · b49c394 · b49c394
1 parent 65f01a2
commit b49c394
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/ApplicationLibrary/Views/Abstract/ShareButton.swift b/ApplicationLibrary/Views/Abstract/ShareButton.swift
@@ -76,7 +76,7 @@ public struct ShareButtonCompat<Label>: View where Label: View {
     #if os(iOS)
         private nonisolated func shareItem0() async {
             do {
-                let shareItem = try itemURL()
+                let shareItem = try await itemURL()
                 await MainActor.run {
                     shareItem1(shareItem)
                 }

diff --git a/ApplicationLibrary/Views/Groups/GroupItemView.swift b/ApplicationLibrary/Views/Groups/GroupItemView.swift
@@ -71,7 +71,7 @@ public struct GroupItemView: View {
         do {
             try await LibboxNewStandaloneCommandClient()!.selectOutbound(group.tag, outboundTag: item.tag)
             var newGroup = await group
-            newGroup.selected = item.tag
+            newGroup.selected = await item.tag
             await MainActor.run { [newGroup] in
                 _group.wrappedValue = newGroup
             }

diff --git a/ApplicationLibrary/Views/Profile/EditProfileView.swift b/ApplicationLibrary/Views/Profile/EditProfileView.swift
@@ -162,7 +162,7 @@ public struct EditProfileView: View {
         do {
             _ = try await ProfileManager.update(profile)
             #if os(iOS) || os(tvOS)
-                try await UIProfileUpdateTask.configure()
+                try UIProfileUpdateTask.configure()
             #else
                 try await ProfileUpdateTask.configure()
             #endif

diff --git a/ApplicationLibrary/Views/Profile/NewProfileView.swift b/ApplicationLibrary/Views/Profile/NewProfileView.swift
@@ -243,7 +243,7 @@ public struct NewProfileView: View {
         ))
         if profileType == .remote {
             #if os(iOS) || os(tvOS)
-                try await UIProfileUpdateTask.configure()
+                try UIProfileUpdateTask.configure()
             #else
                 try await ProfileUpdateTask.configure()
             #endif

diff --git a/ApplicationLibrary/Views/Setting/CoreView.swift b/ApplicationLibrary/Views/Setting/CoreView.swift
@@ -3,6 +3,7 @@ import Libbox
 import Library
 import SwiftUI
 
+@MainActor
 public struct CoreView: View {
     @State private var isLoading = true
 
@@ -51,13 +52,17 @@ public struct CoreView: View {
 
     private nonisolated func loadSettings() async {
         if ApplicationLibrary.inPreview {
-            version = "<redacted>"
-            dataSize = LibboxFormatBytes(1000 * 1000 * 10)
-            isLoading = false
+            await MainActor.run {
+                version = "<redacted>"
+                dataSize = LibboxFormatBytes(1000 * 1000 * 10)
+                isLoading = false
+            }
         } else {
-            version = LibboxVersion()
-            dataSize = "Loading..."
-            isLoading = false
+            await MainActor.run {
+                version = LibboxVersion()
+                dataSize = "Loading..."
+                isLoading = false
+            }
             await loadSettingsBackground()
         }
     }

diff --git a/Library/Network/CommandClient.swift b/Library/Network/CommandClient.swift
@@ -85,8 +85,12 @@ public class CommandClient: ObservableObject {
     }
 
     private func initializeConnectionFilterState() async {
-        connectionStateFilter = await .init(rawValue: SharedPreferences.connectionStateFilter.get()) ?? .all
-        connectionSort = await .init(rawValue: SharedPreferences.connectionSort.get()) ?? .byDate
+        let newFilter: ConnectionStateFilter = await .init(rawValue: SharedPreferences.connectionStateFilter.get()) ?? .active
+        let newSort: ConnectionSort = await .init(rawValue: SharedPreferences.connectionSort.get()) ?? .byDate
+        await MainActor.run {
+            connectionStateFilter = newFilter
+            connectionSort = newSort
+        }
     }
 
     private nonisolated func connect0() async {
@@ -111,7 +115,7 @@ public class CommandClient: ObservableObject {
         case .log:
             clientOptions.statusInterval = Int64(500 * NSEC_PER_MSEC)
         default:
-            clientOptions.statusInterval = Int64(2 * NSEC_PER_SEC)
+            clientOptions.statusInterval = Int64(NSEC_PER_SEC)
         }
         let client = LibboxNewCommandClient(clientHandler(self), clientOptions)!
         do {