fix: BLE connection only allowed one update without app restart #1334
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewer's GuideThis PR overhauls the BLE reconnection flow by ensuring preemptive cleanup in scan and connect states (calling stopScan and disconnect appropriately), refines write operations with added logging and chunk delays for stability, and updates the delete dialog to use responsive padding and adjusted spacings. Sequence diagram for improved BLE reconnection flowsequenceDiagram
actor User
participant App
participant FlutterBluePlus
participant BLEDevice
User->>App: Initiate BLE update
App->>FlutterBluePlus: stopScan() (preemptive)
App->>BLEDevice: disconnect() (preemptive)
App->>FlutterBluePlus: startScan()
FlutterBluePlus-->>App: scanResults
App->>FlutterBluePlus: stopScan() (on device found or error)
App->>BLEDevice: connect()
BLEDevice-->>App: connectionState
App->>BLEDevice: write data in chunks (with delay)
BLEDevice-->>App: write response
App-->>User: Show success or error message
Class diagram for updated BLE state classesclassDiagram
class NormalBleState
class ScanState {
+DataTransferManager manager
+Future<BleState?> processState()
}
class ConnectState {
+ScanResult scanResult
+DataTransferManager manager
+Future<BleState?> processState()
}
class WriteState {
+BluetoothCharacteristic characteristic
+List<List<int>> chunks
+Future<BleState?> processState()
}
NormalBleState <|-- ScanState
NormalBleState <|-- WriteState
RetryBleState <|-- ConnectState
class RetryBleState
class BleState
ScanState ..> DataTransferManager
ConnectState ..> ScanResult
ConnectState ..> DataTransferManager
WriteState ..> BluetoothCharacteristic
File-Level Changes
Assessment against linked issues
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey @samruddhi-Rahegaonkar - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `lib/bademagic_module/bluetooth/scan_state.dart:32` </location>
<code_context>
+ orElse: () => throw Exception("Matching device not found."),
);
- if (foundDevice != null) {
- toast.showToast('Device found. Connecting...');
- isCompleted = true;
- nextStateCompleter.complete(ConnectState(
- scanResult: foundDevice!,
- manager: manager,
</code_context>
<issue_to_address>
Duplicate code for handling found device should be removed.
Executing this logic twice may cause issues like repeated toasts or state changes. Please remove the duplicate block to prevent this.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
32
to
34
| await FlutterBluePlus.stopScan(); | ||
| nextStateCompleter.complete(ConnectState( | ||
| scanResult: foundDevice, |
There was a problem hiding this comment.
issue: Duplicate code for handling found device should be removed.
Executing this logic twice may cause issues like repeated toasts or state changes. Please remove the duplicate block to prevent this.
samruddhi-Rahegaonkar
force-pushed
the
issue#329
branch
from
e22fbb7 to
d7b309f
Compare
Build StatusBuild successful. APKs to test: https://github.com/fossasia/badgemagic-app/actions/runs/16806247721/artifacts/3710904334. Screenshots (Android)
Screenshots (iPhone)
Screenshots (iPad)
|
||||||||||||||||||||||||
-1_home_screen.png?raw=true)
-2_text_badge.png?raw=true){kind=icon}
-3_emoji_badge.png?raw=true){kind=icon}
-4_inverted_emoji_badge.png?raw=true){kind=icon}
-5_saved_badges.png?raw=true)
-6_saved_badges_clicked.png?raw=true)
-7_draw_badge.png?raw=true){kind=icon}
| @@ -12,7 +12,13 @@ class ConnectState extends RetryBleState { | |||
| @override | |||
| Future<BleState?> processState() async { | |||
| bool connected = false; | |||
|
|
|||
| try { | |||
There was a problem hiding this comment.
did you verify this change because I dont think so that it will work by just disconnecting before. We already have this removeIfGone property ro handle this case.
samruddhi-Rahegaonkar
force-pushed
the
issue#329
branch
2 times, most recently
from
cd6d166 to
6ff02b4
Compare
4 tasks
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
samruddhi-Rahegaonkar
force-pushed
the
issue#329
branch
2 times, most recently
from
4e0ed3a to
96960e5
Compare
fix: duplicate logic removed fix: Squashed all commits into one fix: removed comments
samruddhi-Rahegaonkar
force-pushed
the
issue#329
branch
from
503e457 to
a5c57b4
Compare
|
@Jhalakupadhyay I have tested it on badge its working fine! |
Jhalakupadhyay
approved these changes
Jun 26, 2025
|
@samruddhi-Rahegaonkar update the branch and I will merge it |
|
@samruddhi-Rahegaonkar please update the branch |
nope3472
reviewed
Aug 6, 2025
|
@nope3472 Everywhere There is a Error Handling in the code and it disconnects after write. |
|
@hpdang This one is also good to merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1329
Changes
Screenshots / Recordings
Checklist:
constants.dartwithout hard coding any value.Summary by Sourcery
Fix BLE reconnection flow to allow repeated updates without restarting the app and refine dialog layout adjustments.
Bug Fixes:
Enhancements:
Summary by Sourcery
Improve BLE reconnection flow to allow repeated firmware updates without restarting the app and refine the badge deletion dialog layout
Bug Fixes:
Enhancements: