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

Merge branch 'master' into extension-point

This commit is contained in:
Maurice Parker 2020-04-21 20:25:50 -05:00
parent 0e7c47b04e f1357c0a23
commit 5d5093d26d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/AppDelegate.swift
View File

@ -163,13 +163,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
func prepareAccountsForForeground() { func prepareAccountsForForeground() {
extensionFeedAddRequestFile.resume() extensionFeedAddRequestFile.resume()
syncTimer?.update()
if let lastRefresh = AppDefaults.lastRefresh { if let lastRefresh = AppDefaults.lastRefresh {
if Date() > lastRefresh.addingTimeInterval(15 * 60) { if Date() > lastRefresh.addingTimeInterval(15 * 60) {
AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log)
} else { } else {
AccountManager.shared.syncArticleStatusAll() AccountManager.shared.syncArticleStatusAll()
syncTimer?.update()
} }
} else { } else {
AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log)

2
iOS/Article/ImageViewController.swift
View File

@ -29,6 +29,8 @@ class ImageViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
closeButton.imageView?.contentMode = .scaleAspectFit closeButton.imageView?.contentMode = .scaleAspectFit
closeButton.accessibilityLabel = NSLocalizedString("Close", comment: "Close")
shareButton.accessibilityLabel = NSLocalizedString("Share", comment: "Share")
imageScrollView.setup() imageScrollView.setup()
imageScrollView.imageScrollViewDelegate = self imageScrollView.imageScrollViewDelegate = self