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/Ranchero-Software/NetNewsWire into ios-candidate

This commit is contained in:
Maurice Parker 2020-01-27 22:27:05 -07:00
parent ef79005d67 9469ffd6be
commit 9ba6278d73
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/Account/LocalAccount/LocalAccountRefresher.swift
View File

@ -53,12 +53,12 @@ extension LocalAccountRefresher: DownloadSessionDelegate {
return nil return nil
} }
let request = NSMutableURLRequest(url: url) var request = URLRequest(url: url)
if let conditionalGetInfo = feed.conditionalGetInfo { if let conditionalGetInfo = feed.conditionalGetInfo {
conditionalGetInfo.addRequestHeadersToURLRequest(request) conditionalGetInfo.addRequestHeadersToURLRequest(&request)
} }
return request as URLRequest return request
} }
func downloadSession(_ downloadSession: DownloadSession, downloadDidCompleteForRepresentedObject representedObject: AnyObject, response: URLResponse?, data: Data, error: NSError?, completion: @escaping () -> Void) { func downloadSession(_ downloadSession: DownloadSession, downloadDidCompleteForRepresentedObject representedObject: AnyObject, response: URLResponse?, data: Data, error: NSError?, completion: @escaping () -> Void) {

2
Shared/Commands/SendToMicroBlogCommand.swift
View File

@ -50,7 +50,7 @@ final class SendToMicroBlogCommand: SendToCommand {
let s = article.attributionString + article.linkString let s = article.attributionString + article.linkString
let urlQueryDictionary = ["text": s] let urlQueryDictionary = ["text": s]
guard let urlQueryString = urlQueryDictionary.urlQueryString() else { guard let urlQueryString = urlQueryDictionary.urlQueryString else {
return return
} }
guard let url = URL(string: "microblog://post?" + urlQueryString) else { guard let url = URL(string: "microblog://post?" + urlQueryString) else {

2
submodules/RSWeb

@ -1 +1 @@
Subproject commit e513062972cd8097179ed39999f327ad29c8a4e1 Subproject commit 5c9d9c575c8bad32cf12ee81243e6a7d28021667