8264 Use bluetoothScan so WisePad can connect

I mistakenly changed the discovery method from bluetoothScan to bluetoothProximity, which does not allow discovery of the WisePad 3 reader we use in Canada.

This commit changes us back to use bluetoothScan, so we can connect to all the readers we’ve shipped.

Author: joshheald

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
         }
     }
 }

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.")

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,

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,

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)
     }
 }

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 })