From c583c4d474d7770c12422756a56ccfe5c41aba8a Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 6 Jan 2020 18:18:27 -0800 Subject: [PATCH 1/4] Fetch both read and unread orphaned statuses. --- Frameworks/ArticlesDatabase/StatusesTable.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/ArticlesDatabase/StatusesTable.swift b/Frameworks/ArticlesDatabase/StatusesTable.swift index a9e67d5eb..04916d3de 100644 --- a/Frameworks/ArticlesDatabase/StatusesTable.swift +++ b/Frameworks/ArticlesDatabase/StatusesTable.swift @@ -108,7 +108,7 @@ final class StatusesTable: DatabaseTable { var articleIDs = Set() func makeDatabaseCall(_ database: FMDatabase) { - let sql = "select articleID from statuses s where ((starred=1) || (read=0 and dateArrived > ?)) and userDeleted=0 and not exists (select 1 from articles a where a.articleID = s.articleID);" + let sql = "select articleID from statuses s where (starred=1 or dateArrived>?) and userDeleted=0 and not exists (select 1 from articles a where a.articleID = s.articleID);" if let resultSet = database.executeQuery(sql, withArgumentsIn: [cutoffDate]) { articleIDs = resultSet.mapToSet(self.articleIDWithRow) } From 7a7557ac39c86337ff4393c83ffa618533af1723 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 6 Jan 2020 18:23:46 -0800 Subject: [PATCH 2/4] =?UTF-8?q?Delete=20empty=20line.=20(Trying=20to=20deb?= =?UTF-8?q?ug=20why=20I=20can=E2=80=99t=20push.))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mac/AppDelegate.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 79296e81d..a04644019 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -107,7 +107,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } func logDebugMessage(_ message: String) { - logMessage(message, type: .debug) } From 7cf9ae3229e499590b7cecf58d97f44da2d47982 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 6 Jan 2020 18:24:57 -0800 Subject: [PATCH 3/4] Delete a blank line. (Maybe got pushing working now?) --- Mac/AppDelegate.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index a04644019..2d3d0c244 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -111,7 +111,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } func showAddFolderSheetOnWindow(_ window: NSWindow) { - addFolderWindowController = AddFolderWindowController() addFolderWindowController!.runSheetOnWindow(window) } From 2176ebece29e9590678f16ba34c8aeabedae66a6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 6 Jan 2020 18:50:28 -0800 Subject: [PATCH 4/4] Bump build to 25. --- 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 ed3b48168..512bdb5ed 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 -CURRENT_PROJECT_VERSION = 24 +CURRENT_PROJECT_VERSION = 25 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon