diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index a498c04ce..87c061727 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -33,7 +33,7 @@ public enum AccountType: Int { case feedbin = 17 case feedWrangler = 18 case newsBlur = 19 - case googleReaderAPI = 20 + case readerAPI = 20 // TODO: more } @@ -217,7 +217,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, self.delegate = LocalAccountDelegate() case .feedbin: self.delegate = FeedbinAccountDelegate(dataFolder: dataFolder, transport: transport) - case .googleReaderAPI: + case .readerAPI: self.delegate = ReaderAPIAccountDelegate(dataFolder: dataFolder, transport: transport) default: fatalError("Only Local and Feedbin accounts are supported") @@ -246,8 +246,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, defaultName = "FeedWrangler" case .newsBlur: defaultName = "NewsBlur" - case .googleReaderAPI: - defaultName = "Reader" + case .readerAPI: + defaultName = "Reader API" } NotificationCenter.default.addObserver(self, selector: #selector(downloadProgressDidChange(_:)), name: .DownloadProgressDidChange, object: nil) @@ -279,9 +279,9 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, switch credentials { case .basic(let username, _): self.username = username - case .googleBasicLogin(let username, _): + case .readerAPIBasicLogin(let username, _): self.username = username - case .googleAuthLogin(let username, _): + case .readerAPIAuthLogin(let username, _): self.username = username } @@ -306,18 +306,18 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, self.username = nil } - public func retrieveGoogleAuthCredentials() throws -> Credentials? { + public func retrieveReaderAPIAuthCredentials() throws -> Credentials? { guard let username = self.username, let server = delegate.server else { return nil } - return try CredentialsManager.retrieveGoogleAuthCredentials(server: server, username: username) + return try CredentialsManager.retrieveReaderAPIAuthCredentials(server: server, username: username) } - public func removeGoogleAuthCredentials() throws { + public func removeReaderAPIAuthCredentials() throws { guard let username = self.username, let server = delegate.server else { return } - try CredentialsManager.removeGoogleAuthCredentials(server: server, username: username) + try CredentialsManager.removeReaderAPIAuthCredentials(server: server, username: username) self.username = nil } @@ -327,7 +327,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, LocalAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion) case .feedbin: FeedbinAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion) - case .googleReaderAPI: + case .readerAPI: ReaderAPIAccountDelegate.validateCredentials(transport: transport, credentials: credentials, endpoint: endpoint, completion: completion) default: break diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift index 6c2143f66..b81c1cebc 100644 --- a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift +++ b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift @@ -538,7 +538,7 @@ final class ReaderAPIAccountDelegate: AccountDelegate { func accountDidInitialize(_ account: Account) { accountMetadata = account.metadata - credentials = try? account.retrieveGoogleAuthCredentials() + credentials = try? account.retrieveReaderAPIAuthCredentials() } static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL?, completion: @escaping (Result) -> Void) { diff --git a/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift index 4384af936..b2491a0a0 100644 --- a/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift +++ b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift @@ -84,7 +84,7 @@ final class ReaderAPICaller: NSObject { return } - guard case .googleBasicLogin(let username, _) = credentials else { + guard case .readerAPIBasicLogin(let username, _) = credentials else { completion(.failure(CredentialsError.incompleteCredentials)) return } @@ -117,7 +117,7 @@ final class ReaderAPICaller: NSObject { } // Save Auth Token for later use - self.credentials = .googleAuthLogin(username: username, apiKey: authString) + self.credentials = .readerAPIAuthLogin(username: username, apiKey: authString) completion(.success(self.credentials)) case .failure(let error): diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 8b1ab7796..a2610aa89 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -34,6 +34,10 @@ struct AppAssets { return RSImage(named: "accountFeedbin") }() + static var accountReader: RSImage! = { + return RSImage(named: "accountReader") + }() + static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! }() diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib index c035af932..5f56d2f4b 100644 --- a/Mac/Preferences/Accounts/AccountsAddLocal.xib +++ b/Mac/Preferences/Accounts/AccountsAddLocal.xib @@ -1,7 +1,8 @@ - + - + + @@ -18,13 +19,13 @@ - + - + @@ -35,7 +36,7 @@ - + @@ -53,10 +54,10 @@ - + - + @@ -64,7 +65,7 @@ - + @@ -111,7 +112,7 @@ Gw - + diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift index 64d94eafc..4e3019ea4 100644 --- a/Mac/Preferences/Accounts/AccountsAddViewController.swift +++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift @@ -64,8 +64,8 @@ extension AccountsAddViewController: NSTableViewDelegate { cell.accountNameLabel?.stringValue = NSLocalizedString("Feedbin", comment: "Feedbin") cell.accountImageView?.image = AppAssets.accountFeedbin case 2: - cell.accountNameLabel?.stringValue = NSLocalizedString("Reader", comment: "Reader") - cell.accountImageView?.image = AppAssets.accountLocal + cell.accountNameLabel?.stringValue = NSLocalizedString("Reader API", comment: "Reader API") + cell.accountImageView?.image = AppAssets.accountReader default: break } diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 84673da8b..5ad1aaa7a 100644 --- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift +++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift @@ -107,8 +107,8 @@ extension AccountsPreferencesViewController: NSTableViewDelegate { cell.imageView?.image = AppAssets.accountLocal case .feedbin: cell.imageView?.image = NSImage(named: "accountFeedbin") - case .googleReaderAPI: - cell.imageView?.image = AppAssets.accountLocal + case .readerAPI: + cell.imageView?.image = AppAssets.accountReader default: break } diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib index 1da180f56..03f9f638d 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPI.xib +++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib @@ -1,8 +1,8 @@ - + - + @@ -23,13 +23,13 @@ - + - + @@ -37,11 +37,11 @@ - + - - + + @@ -206,6 +206,6 @@ Gw - + diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index ac74eef50..4bdf31256 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -70,8 +70,8 @@ class AccountsReaderAPIWindowController: NSWindowController { return } - let credentials = Credentials.googleBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue) - Account.validateCredentials(type: .googleReaderAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in + let credentials = Credentials.readerAPIBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue) + Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in guard let self = self else { return } @@ -89,14 +89,14 @@ class AccountsReaderAPIWindowController: NSWindowController { var newAccount = false if self.account == nil { - self.account = AccountManager.shared.createAccount(type: .googleReaderAPI) + self.account = AccountManager.shared.createAccount(type: .readerAPI) newAccount = true } do { self.account?.endpointURL = apiURL - try self.account?.removeGoogleAuthCredentials() + try self.account?.removeReaderAPIAuthCredentials() try self.account?.storeCredentials(validatedCredentials) if newAccount { diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json new file mode 100644 index 000000000..d8d735f71 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "accountReader.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf b/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf new file mode 100644 index 000000000..8e49ad8aa Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf differ diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift index 445b7bc16..6b338b75b 100644 --- a/Mac/Scriptability/Account+Scriptability.swift +++ b/Mac/Scriptability/Account+Scriptability.swift @@ -142,7 +142,7 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta osType = "FWrg" case .newsBlur: osType = "NBlr" - case .googleReaderAPI: + case .readerAPI: osType = "Grdr" } return osType.fourCharCode() diff --git a/iOS/Settings/SettingsReaderAPIAccountView.swift b/iOS/Settings/SettingsReaderAPIAccountView.swift index c21dd7891..68322d7ab 100644 --- a/iOS/Settings/SettingsReaderAPIAccountView.swift +++ b/iOS/Settings/SettingsReaderAPIAccountView.swift @@ -77,13 +77,13 @@ struct SettingsReaderAPIAccountView : View { error = Text("") let emailAddress = viewModel.email.trimmingCharacters(in: .whitespaces) - let credentials = Credentials.googleBasicLogin(username: emailAddress, password: viewModel.password) + let credentials = Credentials.readerAPIBasicLogin(username: emailAddress, password: viewModel.password) guard let apiURL = URL(string: viewModel.apiURL) else { self.error = Text("Invalide API URL.") return } - Account.validateCredentials(type: .googleReaderAPI, credentials: credentials, endpoint: apiURL) { result in + Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { result in self.busy = false @@ -95,7 +95,7 @@ struct SettingsReaderAPIAccountView : View { var newAccount = false let workAccount: Account if self.viewModel.account == nil { - workAccount = AccountManager.shared.createAccount(type: .googleReaderAPI) + workAccount = AccountManager.shared.createAccount(type: .readerAPI) newAccount = true } else { workAccount = self.viewModel.account! diff --git a/submodules/RSParser b/submodules/RSParser index f2be15379..52a23c95d 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit f2be15379d64e2f660735219bcbd77f7a759b057 +Subproject commit 52a23c95d4cfd52b827c9f571a2271376ed070fd diff --git a/submodules/RSWeb b/submodules/RSWeb index 4f8844750..afcbd0819 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 4f8844750e9c25b0e43f9ead3de582d32a1321de +Subproject commit afcbd0819c85b263acc892361ed840a9628eba4d