Merge pull request #8266 from woocommerce/issue/8264-fix-wisepad-connections-on-trunk

joshheald · web-flow · commit 55ed0a947393 · 2022-11-30T15:49:04.000Z
[Mobile Payments] Use `bluetoothScan` so we can connect WisePad 3 readers: fix on trunk
diff --git a/Hardware/Hardware/CardReader/StripeCardReader/CardReaderDiscoveryMethod.swift b/Hardware/Hardware/CardReader/StripeCardReader/CardReaderDiscoveryMethod.swift
@@ -4,14 +4,14 @@ import StripeTerminal
 
 public enum CardReaderDiscoveryMethod {
     case localMobile
-    case bluetoothProximity
+    case bluetoothScan
 
     func toStripe() -> DiscoveryMethod {
         switch self {
         case .localMobile:
             return .localMobile
-        case .bluetoothProximity:
-            return .bluetoothProximity
+        case .bluetoothScan:
+            return .bluetoothScan
         }
     }
 }
diff --git a/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSelectSearchType.swift b/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSelectSearchType.swift
@@ -26,7 +26,7 @@ final class CardPresentModalSelectSearchType: CardPresentPaymentsModalViewModel
 
     private var tapOnIphoneAction: (() -> Void)
 
-    private var bluetoothProximityAction: (() -> Void)
+    private var bluetoothScanAction: (() -> Void)
 
     private var cancelAction: (() -> Void)
 
@@ -35,7 +35,7 @@ final class CardPresentModalSelectSearchType: CardPresentPaymentsModalViewModel
     }
 
     func didTapSecondaryButton(in viewController: UIViewController?) {
-        bluetoothProximityAction()
+        bluetoothScanAction()
     }
 
     func didTapAuxiliaryButton(in viewController: UIViewController?) {
@@ -49,8 +49,8 @@ final class CardPresentModalSelectSearchType: CardPresentPaymentsModalViewModel
         actionsMode = .twoActionAndAuxiliary
         primaryButtonTitle = CardReaderDiscoveryMethod.localMobile.name
         self.tapOnIphoneAction = tapOnIPhoneAction
-        secondaryButtonTitle = CardReaderDiscoveryMethod.bluetoothProximity.name
-        self.bluetoothProximityAction = bluetoothAction
+        secondaryButtonTitle = CardReaderDiscoveryMethod.bluetoothScan.name
+        self.bluetoothScanAction = bluetoothAction
         auxiliaryButtonTitle = Localization.cancel
         self.cancelAction = cancelAction
     }
@@ -77,7 +77,7 @@ private extension CardPresentModalSelectSearchType {
 private extension CardReaderDiscoveryMethod {
     var name: String {
         switch self {
-        case .bluetoothProximity:
+        case .bluetoothScan:
             return NSLocalizedString(
                 "Bluetooth Reader",
                 comment: "The button title on the reader type alert, for the user to choose a bluetooth reader.")
diff --git a/WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentPreflightController.swift b/WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentPreflightController.swift
@@ -69,7 +69,7 @@ final class CardPresentPaymentPreflightController {
         // TODO: Replace this with a refactored (New)LegacyCardReaderConnectionController
         self.connectionController = CardReaderConnectionController(
             forSiteID: siteID,
-            discoveryMethod: .bluetoothProximity,
+            discoveryMethod: .bluetoothScan,
             knownReaderProvider: CardReaderSettingsKnownReaderStorage(),
             alertsPresenter: alertsPresenter,
             configuration: configuration,
diff --git a/WooCommerce/Classes/ViewRelated/CardPresentPayments/LegacyCardReaderConnectionController.swift b/WooCommerce/Classes/ViewRelated/CardPresentPayments/LegacyCardReaderConnectionController.swift
@@ -323,7 +323,7 @@ private extension LegacyCardReaderConnectionController {
 
         // TODO: make this a choice for the user, when the switch is enabled
         let tapOnIphoneEnabled = ServiceLocator.generalAppSettings.settings.isTapToPayOnIPhoneSwitchEnabled
-        let discoveryMethod: CardReaderDiscoveryMethod = tapOnIphoneEnabled ? .localMobile : .bluetoothProximity
+        let discoveryMethod: CardReaderDiscoveryMethod = tapOnIphoneEnabled ? .localMobile : .bluetoothScan
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(
             siteID: siteID,
diff --git a/WooCommerce/WooCommerceTests/Stripe Integration Tests/StripeCardReaderIntegrationTests.swift b/WooCommerce/WooCommerceTests/Stripe Integration Tests/StripeCardReaderIntegrationTests.swift
@@ -32,7 +32,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {
             }
         }.store(in: &cancellables)
 
-        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)
+        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)
         wait(for: [receivedReaders], timeout: Constants.expectationTimeout)
     }
 
@@ -68,7 +68,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {
                 .fulfillOnCompletion(expectation: discoveredReaders)
         }.store(in: &cancellables)
 
-        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)
+        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)
         wait(for: [discoveredReaders], timeout: Constants.expectationTimeout)
     }
 
@@ -105,7 +105,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {
             }
         }.store(in: &self.cancellables)
 
-        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)
+        try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)
         wait(for: [discoveredReaders, connectedToReader, connectedreaderIsPublished], timeout: Constants.expectationTimeout)
     }
 }
diff --git a/Yosemite/YosemiteTests/Stores/CardPresentPaymentStoreTests.swift b/Yosemite/YosemiteTests/Stores/CardPresentPaymentStoreTests.swift
@@ -89,7 +89,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(
             siteID: sampleSiteID,
-            discoveryMethod: .bluetoothProximity,
+            discoveryMethod: .bluetoothScan,
             onReaderDiscovered: { _ in }, onError: { _ in })
 
         cardPresentStore.onAction(action)
@@ -107,7 +107,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(
             siteID: sampleSiteID,
-            discoveryMethod: .bluetoothProximity,
+            discoveryMethod: .bluetoothScan,
             onReaderDiscovered: { _ in
                 expectation.fulfill()
             },
@@ -126,7 +126,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                                        cardReaderService: mockCardReaderService)
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(siteID: sampleSiteID,
-                                                                       discoveryMethod: .bluetoothProximity,
+                                                                       discoveryMethod: .bluetoothScan,
                                                                        onReaderDiscovered: { _ in },
                                                                        onError: { _ in })
 
@@ -142,7 +142,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                                        cardReaderService: mockCardReaderService)
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(siteID: sampleSiteID,
-                                                                       discoveryMethod: .bluetoothProximity,
+                                                                       discoveryMethod: .bluetoothScan,
                                                                        onReaderDiscovered: { _ in },
                                                                        onError: { _ in })
 
@@ -170,7 +170,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
 
         let action = CardPresentPaymentAction.startCardReaderDiscovery(
             siteID: sampleSiteID,
-            discoveryMethod: .bluetoothProximity,
+            discoveryMethod: .bluetoothScan,
             onReaderDiscovered: { discoveredReaders in
                 XCTAssertTrue(self.mockCardReaderService.didReceiveAConfigurationProvider)
                 if discoveredReaders.count == 0 {
@@ -231,7 +231,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
 
         let startDiscoveryAction = CardPresentPaymentAction.startCardReaderDiscovery(
             siteID: sampleSiteID,
-            discoveryMethod: .bluetoothProximity,
+            discoveryMethod: .bluetoothScan,
             onReaderDiscovered: { _ in },
             onError: { _ in })
 

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ import StripeTerminal`
`4`	`4`
`5`	`5`	`public enum CardReaderDiscoveryMethod {`
`6`	`6`	`case localMobile`
`7`		`- case bluetoothProximity`
	`7`	`+ case bluetoothScan`
`8`	`8`
`9`	`9`	`func toStripe() -> DiscoveryMethod {`
`10`	`10`	`switch self {`
`11`	`11`	`case .localMobile:`
`12`	`12`	`return .localMobile`
`13`		`- case .bluetoothProximity:`
`14`		`- return .bluetoothProximity`
	`13`	`+ case .bluetoothScan:`
	`14`	`+ return .bluetoothScan`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {`
`32`	`32`	`}`
`33`	`33`	`}.store(in: &cancellables)`
`34`	`34`
`35`		`- try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)`
	`35`	`+ try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)`
`36`	`36`	`wait(for: [receivedReaders], timeout: Constants.expectationTimeout)`
`37`	`37`	`}`
`38`	`38`
`@@ -68,7 +68,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {`
`68`	`68`	`.fulfillOnCompletion(expectation: discoveredReaders)`
`69`	`69`	`}.store(in: &cancellables)`
`70`	`70`
`71`		`- try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)`
	`71`	`+ try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)`
`72`	`72`	`wait(for: [discoveredReaders], timeout: Constants.expectationTimeout)`
`73`	`73`	`}`
`74`	`74`
`@@ -105,7 +105,7 @@ final class StripeCardReaderIntegrationTests: XCTestCase {`
`105`	`105`	`}`
`106`	`106`	`}.store(in: &self.cancellables)`
`107`	`107`
`108`		`- try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothProximity)`
	`108`	`+ try! readerService.start(MockTokenProvider(), discoveryMethod: .bluetoothScan)`
`109`	`109`	`wait(for: [discoveredReaders, connectedToReader, connectedreaderIsPublished], timeout: Constants.expectationTimeout)`
`110`	`110`	`}`
`111`	`111`	`}`