From 50ebfbe51cb7911ac1148929d688b6440db44101 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 24 Jan 2021 12:59:42 -0600 Subject: [PATCH] Return correct error message for failed feed adds. Fixes #2759 --- .../Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift | 4 ---- Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift index 63d4768f1..46e66b540 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift @@ -353,10 +353,6 @@ final class ReaderAPIAccountDelegate: AccountDelegate { switch subResult { case .created(let subscription): self.createFeed(account: account, subscription: subscription, name: name, container: container, completion: completion) - case .alreadySubscribed: - DispatchQueue.main.async { - completion(.failure(AccountError.createErrorAlreadySubscribed)) - } case .notFound: DispatchQueue.main.async { completion(.failure(AccountError.createErrorNotFound)) diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift b/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift index 2c15af057..ae5b29476 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift @@ -12,7 +12,6 @@ import Secrets enum CreateReaderAPISubscriptionResult { case created(ReaderAPISubscription) - case alreadySubscribed case notFound } @@ -375,7 +374,7 @@ final class ReaderAPICaller: NSObject { switch subResult?.numResults { case 0: - completion(.success(.alreadySubscribed)) + completion(.success(.notFound)) default: guard let streamId = subResult?.streamId else { completion(.failure(AccountError.createErrorNotFound))