Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover

# Conflicts:
#	iOS/Settings/AddLocalAccountViewController.swift
#	iOS/Settings/DetailAccountViewController.swift
#	iOS/Settings/Settings.storyboard
This commit is contained in:
Phil Viso
2019-05-19 19:03:50 -05:00
8 changed files with 338 additions and 15 deletions

View File

@@ -70,8 +70,9 @@ final class FeedbinAPICaller: NSObject {
func importOPML(opmlData: Data, completion: @escaping (Result<FeedbinImportResult, Error>) -> Void) {
let callURL = feedbinBaseURL.appendingPathComponent("imports.json")
let request = URLRequest(url: callURL, credentials: credentials)
var request = URLRequest(url: callURL, credentials: credentials)
request.addValue("text/xml; charset=utf-8", forHTTPHeaderField: HTTPRequestHeader.contentType)
transport.send(request: request, method: HTTPMethod.post, payload: opmlData) { result in
switch result {