Skip to content

Commit 0e064eb

Browse files
committed
Using XiphiasNet to do networking
1 parent c875d5a commit 0e064eb

File tree

5 files changed

+34
-59
lines changed

5 files changed

+34
-59
lines changed

Package.resolved

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ let package = Package(
1313
name: "PassLibrary",
1414
targets: ["PassLibrary"])
1515
],
16-
dependencies: [],
16+
dependencies: [
17+
.package(url: "https://github.com/kamaal111/XiphiasNet", from: "3.0.0")
18+
],
1719
targets: [
1820
.target(
1921
name: "PassLibrary",
20-
dependencies: []),
22+
dependencies: ["XiphiasNet"]),
2123
.testTarget(
2224
name: "PassLibraryTests",
2325
dependencies: ["PassLibrary"]),

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ A library to open PKPasses
88
| ------- | --------------------------------------------------------------------------------------------- |
99
| master | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=master) |
1010
| develop | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=develop) |
11+
| v2.0.1 | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=release%2F2.0.0) |
1112
| v2.0.0 | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=release%2F2.0.0) |
1213
| v1.1.0 | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=release%2F1.1.0) |
1314
| v1.0.0 | ![CI](https://github.com/kamaal111/PassLibrary/workflows/CI/badge.svg?branch=release%2F1.0.0) |

Sources/PassLibrary/Networker.swift

Lines changed: 0 additions & 50 deletions
This file was deleted.

Sources/PassLibrary/PassLibrary.swift

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77

88
import PassKit
99
import UIKit
10+
import XiphiasNet
1011

1112
public final class PassLibrary {
1213

13-
private let networker: Networkable
14+
private let networker: XiphiasNetable
1415

15-
internal init(networker: Networkable = Networker()) {
16+
internal init(networker: XiphiasNetable = XiphiasNet()) {
1617
self.networker = networker
1718
}
1819

1920
public init() {
20-
self.networker = Networker()
21+
self.networker = XiphiasNet()
2122
}
2223

2324
public enum PassLibraryError: Error {
@@ -26,13 +27,17 @@ public final class PassLibrary {
2627
case failedToLoadRootVC(message: String)
2728
}
2829

29-
public func getRemotePKPass(from pkpassUrl: String, completion: @escaping (Result<Data, Error>) -> Void) {
30-
self.networker.getPKPass(from: pkpassUrl) { (result: Result<Data, Error>) in
30+
}
31+
32+
public extension PassLibrary {
33+
func getRemotePKPass(from pkpassUrl: String, completion: @escaping (Result<Data, Error>) -> Void) {
34+
guard let url = URL(string: pkpassUrl) else { return }
35+
self.networker.requestData(from: url) { (result: Result<Data, Error>) in
3136
completion(result)
3237
}
3338
}
3439

35-
public func presentAddPKPassViewController(window: UIWindow?, pkpassData: Data) throws {
40+
func presentAddPKPassViewController(window: UIWindow?, pkpassData: Data) throws {
3641
var addPKPassViewController: PKAddPassesViewController?
3742
do {
3843
addPKPassViewController = try self.setupPKAddPassViewController(data: pkpassData)
@@ -48,7 +53,9 @@ public final class PassLibrary {
4853
viewControllerToPresent.modalPresentationStyle = .pageSheet
4954
rootViewContoller.present(viewControllerToPresent, animated: true, completion: nil)
5055
}
56+
}
5157

58+
private extension PassLibrary {
5259
private func setupPKAddPassViewController(data: Data) throws -> PKAddPassesViewController {
5360
var pkpass: PKPass?
5461
do {
@@ -64,5 +71,4 @@ public final class PassLibrary {
6471
}
6572
return addPKPassViewController
6673
}
67-
6874
}

0 commit comments

Comments
 (0)