From 5ab62d3aade3824ad975e5d7be215e52248e4f16 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 6 Apr 2020 09:18:20 -0500 Subject: [PATCH 1/5] Gated the database suspend and resume calls so that the Mac app will compile. --- Frameworks/Account/Account.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 165bc9893..42eefa9d1 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -411,14 +411,18 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, } public func suspendDatabase() { + #if os(iOS) database.cancelAndSuspend() + #endif save() } /// Re-open the SQLite database and allow database calls. /// Call this *before* calling resume. public func resumeDatabaseAndDelegate() { + #if os(iOS) database.resume() + #endif delegate.resume() } From f54f65781c22e0fdca598801d92eaa4c192b2c19 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 8 Apr 2020 21:25:23 -0700 Subject: [PATCH 2/5] =?UTF-8?q?Update=20some=20slightly-changed=20feed=20U?= =?UTF-8?q?RLs=20in=20the=20defaults.=20Replace=20Omni=E2=80=99s=20blog=20?= =?UTF-8?q?with=20Craig=20Hockenberry=E2=80=99s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shared/Importers/DefaultFeeds.opml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shared/Importers/DefaultFeeds.opml b/Shared/Importers/DefaultFeeds.opml index 67fd725e3..90bfa495c 100644 --- a/Shared/Importers/DefaultFeeds.opml +++ b/Shared/Importers/DefaultFeeds.opml @@ -6,19 +6,19 @@ - + - + - - + + From 47cdef5c072dafff7491fad4c366aab897a460e5 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 9 Apr 2020 11:20:53 -0500 Subject: [PATCH 3/5] Fix hashable implementation that could have in theory had collisions. --- Frameworks/Account/FeedIdentifier.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Frameworks/Account/FeedIdentifier.swift b/Frameworks/Account/FeedIdentifier.swift index eed0a7555..842963e74 100644 --- a/Frameworks/Account/FeedIdentifier.swift +++ b/Frameworks/Account/FeedIdentifier.swift @@ -85,12 +85,16 @@ public enum FeedIdentifier: CustomStringConvertible, Hashable { public func hash(into hasher: inout Hasher) { switch self { case .smartFeed(let id): + hasher.combine("smartFeed") hasher.combine(id) case .script(let id): + hasher.combine("smartFeed") hasher.combine(id) case .webFeed(_, let webFeedID): + hasher.combine("webFeed") hasher.combine(webFeedID) case .folder(_, let folderName): + hasher.combine("folder") hasher.combine(folderName) } } From 02f62bbb619d34f9c130a3516b6c73d0d3a8b514 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 11 Apr 2020 15:11:12 -0500 Subject: [PATCH 4/5] Fix image cropping. Issue #1967 --- iOS/Resources/main_ios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/Resources/main_ios.js b/iOS/Resources/main_ios.js index 2945aa292..329225e0b 100644 --- a/iOS/Resources/main_ios.js +++ b/iOS/Resources/main_ios.js @@ -37,7 +37,7 @@ class ImageViewer { var canvas = document.createElement("canvas"); canvas.width = this.img.naturalWidth; canvas.height = this.img.naturalHeight; - canvas.getContext("2d").drawImage(this.img, 0, 0); + canvas.getContext("2d").drawImage(this.img, 0, 0, canvas.width, canvas.height); const rect = this.img.getBoundingClientRect(); const message = { From 7c266d65eec7f53f793ab60e75f04d00003ec876 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 11 Apr 2020 15:58:48 -0500 Subject: [PATCH 5/5] Force the frame to center when displaying. Issue #1983 --- iOS/Article/ImageScrollView.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/iOS/Article/ImageScrollView.swift b/iOS/Article/ImageScrollView.swift index 49233085c..d00224d00 100644 --- a/iOS/Article/ImageScrollView.swift +++ b/iOS/Article/ImageScrollView.swift @@ -191,6 +191,7 @@ open class ImageScrollView: UIScrollView { zoomView!.addGestureRecognizer(upSwipeGesture) configureImageForSize(image.size) + adjustFrameToCenter() } private func configureImageForSize(_ size: CGSize) {