FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to latest RSCore

This commit is contained in:
Maurice Parker 2021-03-24 16:50:35 -05:00
parent ed4896890d
commit 34de76009b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -199,7 +199,7 @@ final class CloudKitAccountDelegate: AccountDelegate {
completion(.success(()))
case .failure(let error):
switch error {
case CloudKitZoneError.invalidParameter:
case CloudKitZoneError.corruptAccount:
// We got into a bad state and should remove the feed to clear up the bad data
account.clearWebFeedMetadata(feed)
container.removeWebFeed(feed)

12
Account/Sources/Account/CloudKit/CloudKitAccountZone.swift
View File

@ -103,7 +103,7 @@ final class CloudKitAccountZone: CloudKitZone {
}
guard let containerExternalID = container.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
record[CloudKitWebFeed.Fields.containerExternalIDs] = [containerExternalID]
@ -121,7 +121,7 @@ final class CloudKitAccountZone: CloudKitZone {
/// Rename the given web feed
func renameWebFeed(_ webFeed: WebFeed, editedName: String?, completion: @escaping (Result<Void, Error>) -> Void) {
guard let externalID = webFeed.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
@ -142,7 +142,7 @@ final class CloudKitAccountZone: CloudKitZone {
/// Removes a web feed from a container and optionally deletes it, calling the completion with true if deleted
func removeWebFeed(_ webFeed: WebFeed, from: Container, completion: @escaping (Result<Bool, Error>) -> Void) {
guard let fromContainerExternalID = from.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
@ -187,7 +187,7 @@ final class CloudKitAccountZone: CloudKitZone {
func moveWebFeed(_ webFeed: WebFeed, from: Container, to: Container, completion: @escaping (Result<Void, Error>) -> Void) {
guard let fromContainerExternalID = from.externalID, let toContainerExternalID = to.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
@ -209,7 +209,7 @@ final class CloudKitAccountZone: CloudKitZone {
func addWebFeed(_ webFeed: WebFeed, to: Container, completion: @escaping (Result<Void, Error>) -> Void) {
guard let toContainerExternalID = to.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
@ -292,7 +292,7 @@ final class CloudKitAccountZone: CloudKitZone {
func renameFolder(_ folder: Folder, to name: String, completion: @escaping (Result<Void, Error>) -> Void) {
guard let externalID = folder.externalID else {
completion(.failure(CloudKitZoneError.invalidParameter))
completion(.failure(CloudKitZoneError.corruptAccount))
return
}

8
NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -60,8 +60,8 @@
"repositoryURL": "https://github.com/Ranchero-Software/RSCore.git",
"state": {
"branch": null,
"revision": "09bdc9af601af2ca6a3a72a8b3c6aec04dfdbd88",
"version": "1.0.4"
"revision": "665319af9428455e45c1d043156db85548b73f31",
"version": "1.0.5"
}
},
{
@ -96,8 +96,8 @@
"repositoryURL": "https://github.com/Ranchero-Software/RSWeb.git",
"state": {
"branch": null,
"revision": "2f7bc7671a751e994e2567c8221ba64e884d5583",
"version": "1.0.0"
"revision": "2f9ad98736c5c17dfb2be0b3cc06e71a49b061fa",
"version": "1.0.1"
}
},
{