Convert importOPML to async await.

Account/Package.swift

@@ -48,10 +48,10 @@ let package = Package(
 				"FeedFinder",
 				"CommonErrors",
 				"Feedly"
+			],
+			swiftSettings: [
+				.enableExperimentalFeature("StrictConcurrency")
 			]
-//			swiftSettings: [
-//				.enableExperimentalFeature("StrictConcurrency")
-//			]
 		),
 		.testTarget(
 			name: "AccountTests",

Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift

@@ -259,53 +259,24 @@ final class FeedlyAccountDelegate: AccountDelegate {
 	
 	func importOPML(for account: Account, opmlFile: URL) async throws {
 
-		try await withCheckedThrowingContinuation { continuation in
+		let data = try Data(contentsOf: opmlFile)
-			self.importOPML(for: account, opmlFile: opmlFile) { result in
-				switch result {
-				case .success:
-					continuation.resume()
-				case .failure(let error):
-					continuation.resume(throwing: error)
-				}
-			}
-		}
-	}
 
-	private func importOPML(for account: Account, opmlFile: URL, completion: @escaping @Sendable (Result<Void, Error>) -> Void) {
+		os_log(.debug, log: log, "Begin importing OPML…")
-		let data: Data
+
+		isOPMLImportInProgress = true
+		refreshProgress.addTask()
+		defer {
+			isOPMLImportInProgress = false
+			refreshProgress.completeTask()
+		}
 
 		do {
-			data = try Data(contentsOf: opmlFile)
+			try await caller.importOPML(data)
-		} catch {
-			completion(.failure(error))
-			return
-		}
-		
-		os_log(.debug, log: log, "Begin importing OPML...")
-		isOPMLImportInProgress = true
-		refreshProgress.addToNumberOfTasksAndRemaining(1)
-		
-		caller.importOpml(data) { result in
-
-			MainActor.assumeIsolated {
-				switch result {
-				case .success:
 			os_log(.debug, log: self.log, "Import OPML done.")
-					self.refreshProgress.completeTask()
+		} catch {
-					self.isOPMLImportInProgress = false
-					DispatchQueue.main.async {
-						completion(.success(()))
-					}
-				case .failure(let error):
 			os_log(.debug, log: self.log, "Import OPML failed.")
-					self.refreshProgress.completeTask()
-					self.isOPMLImportInProgress = false
-					DispatchQueue.main.async {
 			let wrappedError = AccountError.wrappedError(error: error, account: account)
-						completion(.failure(wrappedError))
+			throw wrappedError
-					}
-				}
-			}
 		}
 	}
 

Account/Sources/Account/Feedly/FeedlyAPICaller.swift

@@ -17,7 +17,7 @@ protocol FeedlyAPICallerDelegate: AnyObject {
 	@MainActor func reauthorizeFeedlyAPICaller(_ caller: FeedlyAPICaller, completionHandler: @escaping (Bool) -> ())
 }
 
-final class FeedlyAPICaller {
+@MainActor final class FeedlyAPICaller {
 
 	enum API {
 		case sandbox
@@ -151,18 +151,15 @@ final class FeedlyAPICaller {
 		}
 	}
 	
-	func importOpml(_ opmlData: Data, completion: @escaping @Sendable (Result<Void, Error>) -> ()) {
+	func importOPML(_ opmlData: Data) async throws {
+
 		guard !isSuspended else {
-			return DispatchQueue.main.async {
+			throw TransportError.suspended
-				completion(.failure(TransportError.suspended))
 		}
+		guard let accessToken = credentials?.secret else {
+			throw CredentialsError.incompleteCredentials
 		}
 
-		guard let accessToken = credentials?.secret else {
-			return DispatchQueue.main.async {
-				completion(.failure(CredentialsError.incompleteCredentials))
-			}
-		}
 		var components = baseUrlComponents
 		components.path = "/v3/opml"
 
@@ -177,17 +174,9 @@ final class FeedlyAPICaller {
 		request.addValue("OAuth \(accessToken)", forHTTPHeaderField: HTTPRequestHeader.authorization)
 		request.httpBody = opmlData
 
-		send(request: request, resultType: String.self, dateDecoding: .millisecondsSince1970, keyDecoding: .convertFromSnakeCase) { result in
+		let (httpResponse, _) = try await send(request: request, resultType: String.self)
-			switch result {
+		if httpResponse.statusCode != HTTPResponseCode.OK {
-			case .success(let (httpResponse, _)):
+			throw URLError(.cannotDecodeContentData)
-				if httpResponse.statusCode == 200 {
-					completion(.success(()))
-				} else {
-					completion(.failure(URLError(.cannotDecodeContentData)))
-				}
-			case .failure(let error):
-				completion(.failure(error))
-			}
 		}
 	}