Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4110 from maa-x/ios_self-host_fix

Browse Source 
Use shared UserDefaults instead of standard set
This commit is contained in:
Jackson Harper
2024-06-26 09:14:54 +08:00
committed by GitHub
parent 3c634d1c35 e04ae10fa4
commit 797fdb6b54
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift
View File

@ -10,9 +10,9 @@ class SelfHostSettingsViewModel: ObservableObject {
}
struct SelfHostSettingsView: View {
@State var apiServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) ?? ""
@State var webServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) ?? ""
@State var ttsServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) ?? ""
@State var apiServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) ?? ""
@State var webServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) ?? ""
@State var ttsServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) ?? ""
@State var showConfirmAlert = false

27
apple/OmnivoreKit/Sources/Models/AppEnvironment.swift
View File

@ -40,15 +40,18 @@ public enum AppEnvironmentUserDefaultKey: String {
public extension AppEnvironment {
static func setCustom(serverBaseURL: String, webAppBaseURL: String, ttsBaseURL: String) {
UserDefaults.standard.set(
guard let sharedDefaults = UserDefaults(suiteName: "group.app.omnivoreapp") else {
fatalError("Could not create shared user defaults")
}
sharedDefaults.set(
serverBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines),
forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue
)
UserDefaults.standard.set(
sharedDefaults.set(
webAppBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines),
forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue
)
UserDefaults.standard.set(
sharedDefaults.set(
ttsBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines),
forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue
)
@ -56,11 +59,14 @@ public extension AppEnvironment {
var environmentConfigured: Bool {
if self == .custom {
if let str = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue), let url = URL(string: str) {
return true
} else {
guard
let sharedDefaults = UserDefaults(suiteName: "group.app.omnnivoreapp"),
let str = sharedDefaults.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue),
let url = URL(string: str)
else {
return false
}
return true
}
return true
}
@ -94,7 +100,8 @@ public extension AppEnvironment {
return URL(string: "http://localhost:4000")!
case .custom:
guard
let str = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue),
let sharedDefaults = UserDefaults(suiteName: "group.app.omnnivoreapp"),
let str = sharedDefaults.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue),
let url = URL(string: str)
else {
fatalError("custom serverBaseURL not set")
@ -113,7 +120,8 @@ public extension AppEnvironment {
return URL(string: "http://localhost:3000")!
case .custom:
guard
let str = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue),
let sharedDefaults = UserDefaults(suiteName: "group.app.omnnivoreapp"),
let str = sharedDefaults.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue),
let url = URL(string: str)
else {
fatalError("custom webAppBaseURL not set")
@ -132,7 +140,8 @@ public extension AppEnvironment {
return URL(string: "http://localhost:8080")!
case .custom:
guard
let str = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue),
let sharedDefaults = UserDefaults(suiteName: "group.app.omnnivoreapp"),
let str = sharedDefaults.string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue),
let url = URL(string: str)
else {
fatalError("custom ttsBaseURL not set")