From f455bcec16823549fc3720b1f6feed75bba050a4 Mon Sep 17 00:00:00 2001 From: Kiel Gillard Date: Thu, 2 Jan 2020 09:34:24 +1100 Subject: [PATCH 1/2] Models the feed website url of feedly articles as an optional since it seems the Feedly API will not always provide one. Issue #1449. --- Frameworks/Account/Feedly/Models/FeedlyOrigin.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/Account/Feedly/Models/FeedlyOrigin.swift b/Frameworks/Account/Feedly/Models/FeedlyOrigin.swift index dda70dc33..1de7c0434 100644 --- a/Frameworks/Account/Feedly/Models/FeedlyOrigin.swift +++ b/Frameworks/Account/Feedly/Models/FeedlyOrigin.swift @@ -11,5 +11,5 @@ import Foundation struct FeedlyOrigin: Decodable { var title: String? var streamId: String? - var htmlUrl: String + var htmlUrl: String? } From 2ee50054dcf1bf9fd98f06d7a71db282a6ed0b91 Mon Sep 17 00:00:00 2001 From: Kiel Gillard Date: Thu, 2 Jan 2020 10:00:09 +1100 Subject: [PATCH 2/2] Indicate FeedlyOperations are asynchronous. --- Frameworks/Account/Feedly/Operations/FeedlyOperation.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Frameworks/Account/Feedly/Operations/FeedlyOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyOperation.swift index 2057fe657..190bc3771 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyOperation.swift @@ -29,6 +29,10 @@ class FeedlyOperation: Operation { } } + override var isAsynchronous: Bool { + return true + } + func didFinish() { assert(Thread.isMainThread) assert(!isFinished, "Finished operation is attempting to finish again.")