Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Mobile Payments] Prevent sleep during Card Reader software updates #14021

Merged
merged 3 commits into from
Sep 25, 2024
Merged

[Mobile Payments] Prevent sleep during Card Reader software updates #14021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f2afa1
Prevent sleep during Card Reader software updates
joshheald Sep 23, 2024
39750d1
Add reader update sleep prevention to 20.6 release
joshheald Sep 23, 2024
0a359f3
Merge branch 'trunk' into hack/prevent-sleep-during-card-reader-updates
joshheald Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import Combine
import StripeTerminal
import CoreBluetooth
import class UIKit.UIApplication

/// The adapter wrapping the Stripe Terminal SDK
public final class StripeCardReaderService: NSObject {
Expand Down Expand Up @@ -866,6 +867,7 @@ extension StripeCardReaderService: BluetoothReaderDelegate {
}

public func reader(_ reader: Reader, didStartInstallingUpdate update: ReaderSoftwareUpdate, cancelable: StripeTerminal.Cancelable?) {
UIApplication.shared.isIdleTimerDisabled = true
softwareUpdateSubject.send(.started(cancelable: cancelable.map(StripeCancelable.init(cancelable:))))
}

Expand All @@ -874,6 +876,8 @@ extension StripeCardReaderService: BluetoothReaderDelegate {
}

public func reader(_ reader: Reader, didFinishInstallingUpdate update: ReaderSoftwareUpdate?, error: Error?) {
// Note that this function is called with an error when updates are cancelled, so this is enough to ensure we re-enable sleep.
UIApplication.shared.isIdleTimerDisabled = false
if let error = error {
let underlyingError = Self.logAndDecodeError(error)
softwareUpdateSubject.send(.failed(
Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [*] Jetpack setup: fixed issue checking site info after activating Jetpack for sites with Jetpack connection package. [https://github.com/woocommerce/woocommerce-ios/pull/13993]
- [*] Blaze: Campaign status is now updated immediately after being canceled. [https://github.com/woocommerce/woocommerce-ios/pull/13992]
- [internal] Logging for app storage size added in Core Data crash logs [https://github.com/woocommerce/woocommerce-ios/pull/14008]
- [*] Payments: Prevent phone from sleeping during card reader updates [https://github.com/woocommerce/woocommerce-ios/pull/14021]
- [internal] Fixed concurrency issue with Blaze local notification scheduler. [https://github.com/woocommerce/woocommerce-ios/pull/14012]

20.5
Expand Down