From e93bec3114f511858dd21e2cffbb487008bdd1bd Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 25 Apr 2020 18:25:00 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20bug=20where=20local=20account=20could?= =?UTF-8?q?=20delete=20starred=20items=20if=20they=E2=80=99ve=20older=20an?= =?UTF-8?q?d=20have=20fallen=20off=20the=20feed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/ArticlesDatabase/ArticlesTable.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift index db997afb6..0800450f8 100644 --- a/Frameworks/ArticlesDatabase/ArticlesTable.swift +++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift @@ -209,10 +209,10 @@ final class ArticlesTable: DatabaseTable { let newArticles = self.findAndSaveNewArticles(incomingArticles, fetchedArticlesDictionary, database) //5 let updatedArticles = self.findAndSaveUpdatedArticles(incomingArticles, fetchedArticlesDictionary, database) //6 - // Articles to delete are 1) no longer in feed and 2) older than 30 days. + // Articles to delete are 1) not starred and 2) older than 30 days and 3) no longer in feed. let cutoffDate = Date().bySubtracting(days: 30) let articlesToDelete = fetchedArticles.filter { (article) -> Bool in - return article.status.dateArrived < cutoffDate && !articleIDs.contains(article.articleID) + return !article.status.starred && article.status.dateArrived < cutoffDate && !articleIDs.contains(article.articleID) } self.callUpdateArticlesCompletionBlock(newArticles, updatedArticles, articlesToDelete, completion) //7 From 2de8e128b06399a334ab7472e3fb51313613776d Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 25 Apr 2020 18:37:08 -0700 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version=20to=2042.=20Oh=20hell=20yes?= =?UTF-8?q?=20we=E2=80=99ve=20been=20waiting=20for=20this=20one.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 b76a85b25..ea57f1efd 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 = 5.0.1 -CURRENT_PROJECT_VERSION = 41 +CURRENT_PROJECT_VERSION = 42 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon