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

[Woo POS] We don't handle the low battery event during IPP flow properly #12568

Draft
wants to merge 7 commits into
base: trunk
Choose a base branch
from
Draft

[Woo POS] We don't handle the low battery event during IPP flow properly #12568

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54a52a3
Remove toast
backwardstruck Sep 9, 2024
d3fe47b
We should NOT reset the connection
backwardstruck Sep 9, 2024
2fd4752
Do some kind of check for low battery
backwardstruck Sep 9, 2024
a2bd85e
Merge branch 'trunk' into 12565-woo-pos-we-dont-handle-the-low-batter…
backwardstruck Sep 10, 2024
c0fa619
Merge branch 'trunk' into 12565-woo-pos-we-dont-handle-the-low-batter…
backwardstruck Sep 16, 2024
859e329
Merge branch 'trunk' into 12565-woo-pos-we-dont-handle-the-low-batter…
backwardstruck Sep 17, 2024
afcb619
Merge branch 'trunk' into 12565-woo-pos-we-dont-handle-the-low-batter…
backwardstruck Sep 23, 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
8 changes: 7 additions & 1 deletion ...src/main/java/com/woocommerce/android/cardreader/internal/connection/ConnectionManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,13 @@ internal class ConnectionManager(
connectedScope.launch {
terminalListenerImpl.readerStatus.collect { connectionStatus ->
if (connectionStatus is CardReaderStatus.NotConnected) {
bluetoothReaderListener.resetConnectionState()
if (connectionStatus.errorMessage != null) {
if (connectionStatus.errorMessage.contains("battery")) {
//
} else {
bluetoothReaderListener.resetConnectionState()
}
}
connectedScope.cancel()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...der/src/main/java/com/woocommerce/android/cardreader/internal/wrappers/TerminalWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ internal class TerminalWrapper {
private fun mapFrequencyOptions(updateFrequency: CardReaderManager.SimulatorUpdateFrequency): SimulateReaderUpdate {
return when (updateFrequency) {
CardReaderManager.SimulatorUpdateFrequency.NEVER -> SimulateReaderUpdate.NONE
CardReaderManager.SimulatorUpdateFrequency.ALWAYS -> SimulateReaderUpdate.REQUIRED
CardReaderManager.SimulatorUpdateFrequency.ALWAYS -> SimulateReaderUpdate.LOW_BATTERY
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is test code, to be removed before merging.

CardReaderManager.SimulatorUpdateFrequency.RANDOM -> SimulateReaderUpdate.RANDOM
}
}
Expand Down
Loading