Merge pull request #1604 from Wevah/ios-candidate

Update to latest RSCore
This commit is contained in:
Brent Simmons
2020-01-10 23:47:08 -08:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -85,7 +85,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
NSWindow.allowsAutomaticWindowTabbing = false
super.init()
AccountManager.shared = AccountManager(accountsFolder: RSDataSubfolder(nil, "Accounts")!)
AccountManager.shared = AccountManager(accountsFolder: Platform.dataSubfolder(forApplication: nil, folderName: "Accounts")!)
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil)

View File

@@ -98,7 +98,7 @@ class AddFeedController: AddFeedWindowControllerDelegate {
private extension AddFeedController {
var urlStringFromPasteboard: String? {
if let urlString = NSPasteboard.rs_urlString(from: NSPasteboard.general) {
if let urlString = NSPasteboard.urlString(from: NSPasteboard.general) {
return urlString.rs_normalizedURL()
}
return nil

View File

@@ -24,7 +24,7 @@ private let styleSuffixes = [styleSuffix, nnwStyleSuffix, cssStyleSuffix];
final class ArticleStylesManager {
static let shared = ArticleStylesManager()
private let folderPath = RSDataSubfolder(nil, stylesFolderName)!
private let folderPath = Platform.dataSubfolder(forApplication: nil, folderName: stylesFolderName)!
var currentStyleName: String {
get {