Mastodon
/
Bubble
mirror of https://github.com/lumaa-dev/BubbleApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when trying to access any UserPreference

This commit is contained in:
Lumaa 2024-03-09 22:46:07 +01:00
parent ece76f886a
commit e5065b2f25
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Threaded/Data/UserPreferences.swift
View File

@ -60,13 +60,24 @@ class UserPreferences: Codable, ObservableObject {
UserDefaults.standard.setValue(json, forKey: UserPreferences.saveKey)
}
static func loadAsCurrent() throws -> UserPreferences? {
static func loadAsCurrent() throws -> UserPreferences {
let decoder = JSONDecoder()
if let data = UserDefaults.standard.data(forKey: UserPreferences.saveKey) {
let pref = try decoder.decode(UserPreferences.self, from: data)
return pref
let pref = try? decoder.decode(UserPreferences.self, from: data)
return pref ?? UserPreferences.defaultPreferences
}
return nil
return UserPreferences.defaultPreferences
}
// WARNINGS EVERYWHERE WHY...
required init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
self.displayedName = try container.decode(DisplayedName.self, forKey: ._displayedName) ?? .username
self.profilePictureShape = try container.decode(ProfilePictureShape.self, forKey: ._profilePictureShape) ?? .circle
self.browserType = try container.decode(BrowserType.self, forKey: ._browserType) ?? .inApp
self.defaultVisibility = try container.decode(Visibility.self, forKey: ._defaultVisibility) ?? .pub
self.showExperimental = try container.decode(Bool.self, forKey: ._showExperimental) ?? false
self.experimental = try container.decode(UserPreferences.Experimental.self, forKey: ._experimental) ?? .init()
}
// Enums and other