From 5c0a34540eee3c606da07be357f7047033456614 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 16 May 2021 20:11:59 -0700 Subject: [PATCH 1/4] Bump version to 603. --- xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index 658143103..e643a8230 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -1,7 +1,7 @@ // High Level Settings common to both the iOS application and any extensions we bundle with it MARKETING_VERSION = 6.0 -CURRENT_PROJECT_VERSION = 602 +CURRENT_PROJECT_VERSION = 603 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon From 251b19d26c66db8099109dfdcc3572cbf54bfb44 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 16 May 2021 20:22:15 -0700 Subject: [PATCH 2/4] =?UTF-8?q?Tweak=20text=20for=20Feed=20Providers=20exp?= =?UTF-8?q?lanation.=20Now:=20=E2=80=9CFeed=20Providers=20allow=20you=20to?= =?UTF-8?q?=20subscribe=20to=20some=20pages=20as=20if=20they=20were=20RSS?= =?UTF-8?q?=20feeds.=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iOS/Settings/AddExtensionPointViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/Settings/AddExtensionPointViewController.swift b/iOS/Settings/AddExtensionPointViewController.swift index f0d31752f..249498dba 100644 --- a/iOS/Settings/AddExtensionPointViewController.swift +++ b/iOS/Settings/AddExtensionPointViewController.swift @@ -44,7 +44,7 @@ class AddExtensionPointViewController: UITableViewController, AddExtensionPointD } override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? { - return NSLocalizedString("Feed Providers allow you to subscribe to website URLs as if they were RSS feeds.", comment: "Feed Provider Footer") + return NSLocalizedString("Feed Providers allow you to subscribe to some pages as if they were RSS feeds.", comment: "Feed Provider Footer") } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { From b90ba3e7ba887661a4962f11ab60437f5fc73fb6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 16 May 2021 20:44:33 -0700 Subject: [PATCH 3/4] Update release notes for 603. --- Technotes/ReleaseNotes-iOS.markdown | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index d17fe9b43..0054166eb 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,5 +1,23 @@ # iOS Release Notes +### 6.0 TestFlight build 603 - 16 May 2021 + +Feedly: handle Feedly API change with return value on deleting a folder +NewsBlur: sync no longer includes items marked as hidden on NewsBlur +FreshRSS: form for adding account now suggests endpoing URL +FreshRSS: improved the error message for when the API URL can’t be found +iCloud: retain existing feeds moved to a folder that doesn’t exist yet (sync ordering issue) +Renamed a Delete Account button to Remove Account +iCloud: skip displaying an error message on deleting a feed that doesn’t exist in iCloud +Preferences: Tweaked text explaining Feed Providers +Feeds list: context menu for smart feeds is back (regression fix) +Feeds list: all smart feeds remain visible despite Hide Read Feeds setting +Article view: fixed zoom issue on iPad on rotation +Article view: fixed bug where mark-read button on toolbar would flash on navigating to an unread article +Article view: made footnote detection more robust +Fixed regression on iPad where timeline and article wouldn’t update after the selected feed was deleted +Sharing: handle feeds where the URL has unencoded space characters (why a feed would do that is beyond our ken) + ### 6.0 TestFlight build 602 - 21 April 2021 Inoreader: don’t call it so often, so we don’t go over the API limits From c5897f78aedcfb6e71ec69544aa45bc250bebdc8 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 17 May 2021 14:06:55 -0500 Subject: [PATCH 4/4] Change to test all characters for multiple scalars. Fixes #3120 --- .../FeedProvider/Twitter/TwitterStatus.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift index 59f3dfc58..149814667 100644 --- a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift +++ b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift @@ -78,21 +78,21 @@ private extension TwitterStatus { var html = String() var prevIndex = displayStartIndex - var emojiOffset = 0 + var unicodeScalarOffset = 0 for entity in entities { - // The twitter indices are messed up by emoji with more than one scalar, we are going to adjust for that here. - let emojiEndIndex = text.index(text.startIndex, offsetBy: entity.endIndex, limitedBy: text.endIndex) ?? text.endIndex - if prevIndex < emojiEndIndex { - let emojis = String(text[prevIndex..