FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ios-candidate' of https://github.com/brentsimmons/NetNewsWire into ios-candidate

This commit is contained in:
Maurice Parker 2020-01-06 21:23:55 -07:00
parent 746d061dcf 2176ebece2
commit 8a670afbe5
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/ArticlesDatabase/StatusesTable.swift
View File

@ -108,7 +108,7 @@ final class StatusesTable: DatabaseTable {
var articleIDs = Set<String>() var articleIDs = Set<String>()
func makeDatabaseCall(_ database: FMDatabase) { 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]) { if let resultSet = database.executeQuery(sql, withArgumentsIn: [cutoffDate]) {
articleIDs = resultSet.mapToSet(self.articleIDWithRow) articleIDs = resultSet.mapToSet(self.articleIDWithRow)
} }

2
Mac/AppDelegate.swift
View File

@ -107,12 +107,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
} }
func logDebugMessage(_ message: String) { func logDebugMessage(_ message: String) {
logMessage(message, type: .debug) logMessage(message, type: .debug)
} }
func showAddFolderSheetOnWindow(_ window: NSWindow) { func showAddFolderSheetOnWindow(_ window: NSWindow) {
addFolderWindowController = AddFolderWindowController() addFolderWindowController = AddFolderWindowController()
addFolderWindowController!.runSheetOnWindow(window) addFolderWindowController!.runSheetOnWindow(window)
} }

2
xcconfig/common/NetNewsWire_ios_target_common.xcconfig
View File

@ -1,7 +1,7 @@
// High Level Settings common to both the iOS application and any extensions we bundle with it // High Level Settings common to both the iOS application and any extensions we bundle with it
MARKETING_VERSION = 5.0 MARKETING_VERSION = 5.0
CURRENT_PROJECT_VERSION = 24 CURRENT_PROJECT_VERSION = 25
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon