FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2478 from kielgillard/mac-release

Browse Source 
macOS: Encode the + in Feedly collection URIs. Fixes #2443.
This commit is contained in:
Maurice Parker 2020-10-05 17:30:01 -05:00 committed by GitHub
commit bd38c1219c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Frameworks/Account/Feedly/FeedlyAPICaller.swift
View File

@ -48,10 +48,15 @@ final class FeedlyAPICaller {
private let transport: Transport private let transport: Transport
private let baseUrlComponents: URLComponents private let baseUrlComponents: URLComponents
private let uriComponentAllowed: CharacterSet
init(transport: Transport, api: API) { init(transport: Transport, api: API) {
self.transport = transport self.transport = transport
self.baseUrlComponents = api.baseUrlComponents self.baseUrlComponents = api.baseUrlComponents
var urlHostAllowed = CharacterSet.urlHostAllowed
urlHostAllowed.remove("+")
uriComponentAllowed = urlHostAllowed
} }
weak var delegate: FeedlyAPICallerDelegate? weak var delegate: FeedlyAPICallerDelegate?
@ -272,7 +277,7 @@ final class FeedlyAPICaller {
} }
private func encodeForURLPath(_ pathComponent: String) -> String? { private func encodeForURLPath(_ pathComponent: String) -> String? {
return pathComponent.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) return pathComponent.addingPercentEncoding(withAllowedCharacters: uriComponentAllowed)
} }
func deleteCollection(with id: String, completion: @escaping (Result<Void, Error>) -> ()) { func deleteCollection(with id: String, completion: @escaping (Result<Void, Error>) -> ()) {