From 7ed311ebba6414adc4f34cb4ab51d6eb2e89a8da Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 25 Oct 2020 19:52:19 -0500 Subject: [PATCH] Make itemRefs an optional value since it isn't always returned by Inoreader --- Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift | 6 +++--- .../Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift b/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift index 22cd29792..0faa7d780 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift @@ -708,12 +708,12 @@ final class ReaderAPICaller: NSObject { switch result { case .success(let (_, entries)): - guard let entries = entries else { + guard let entriesItemRefs = entries?.itemRefs else { completion(.failure(ReaderAPIAccountDelegateError.invalidResponse)) return } - guard entries.itemRefs.count > 0 else { + guard entriesItemRefs.count > 0 else { completion(.success((nil, nil, nil))) return } @@ -728,7 +728,7 @@ final class ReaderAPICaller: NSObject { request.httpMethod = "POST" // Get ids from above into hex representation of value - let idsToFetch = entries.itemRefs.map({ (reference) -> String in + let idsToFetch = entriesItemRefs.map({ (reference) -> String in if self.variant == .theOldReader { return "i=tag:google.com,2005:reader/item/\(reference.itemId)" } else { diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift b/Account/Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift index a69909c21..99327a821 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift @@ -9,7 +9,7 @@ import Foundation struct ReaderAPIReferenceWrapper: Codable { - let itemRefs: [ReaderAPIReference] + let itemRefs: [ReaderAPIReference]? enum CodingKeys: String, CodingKey { case itemRefs = "itemRefs"