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)
}
}
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 @@
-
+
-
+
-
-
+
+
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) {
diff --git a/iOS/Resources/main_ios.js b/iOS/Resources/main_ios.js
index 4f7b0f8ee..8411a57ac 100644
--- a/iOS/Resources/main_ios.js
+++ b/iOS/Resources/main_ios.js
@@ -36,7 +36,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 = {