Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project>
<PropertyGroup>
<AssemblyVersion>3.0.11.0</AssemblyVersion>
<FileVersion>3.0.11.0</FileVersion>
<AssemblyVersion>3.0.13.0</AssemblyVersion>
<FileVersion>3.0.13.0</FileVersion>
</PropertyGroup>
</Project>



1 change: 1 addition & 0 deletions OSDP-Bench.sln
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{ED2EC291-3
ProjectSection(SolutionItems) = preProject
README.md = README.md
docs\CLAUDE.md = docs\CLAUDE.md
docs\ConnectionButtonBehavior.md = docs\ConnectionButtonBehavior.md
EndProjectSection
EndProject
Global
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Core functionality is under an open source license to help increase the adoption

OSDP Bench is available for purchase on multiple platforms:

[![Microsoft Store](https://get.microsoft.com/images/en-us%20dark.svg)](ms-windows-store://pdp/?productid=9N3W7QR3R5S7&cid=&mode=mini)
[![Microsoft Store](https://get.microsoft.com/images/en-us%20dark.svg)](https://apps.microsoft.com/detail/9n3w7qr3r5s7?hl=en-US&gl=US)
[![Google Play](src/Assets/google-play.svg)](https://play.google.com/store/apps/details?id=com.z_bitco.com.osdpbenchmobile)

## Getting Started
Expand Down
51 changes: 51 additions & 0 deletions docs/ConnectionButtonBehavior.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
## Implementation Status Summary

### Discover Mode (ConnectionTypeComboBox Index = 0)

| State | Discovery Button | Connect Button | Disconnect Button | Cancel Button | ConnectionTypeComboBox | Status |
|-------------------------|------------------|----------------|-------------------|---------------|------------------------|---------------|
| **Disconnected** | Visible | Hidden | Hidden | Hidden | Enabled | ✓ Correct |
| **Discovering** | Hidden | Hidden | Hidden | Visible | Disabled | ✓ Correct |
| **Discovery Cancelled** | Visible | Hidden | Hidden | Hidden | Enabled | ✓ Correct |
| **Discovered** | Hidden | Hidden | Visible | Hidden | Disabled | ✓ Correct |
| **Connecting** | Hidden | Hidden | Visible | Hidden | Disabled | ✓ Correct |
| **Connected** | Hidden | Hidden | Visible | Hidden | Disabled | ✓ Correct |
| **Error** | Hidden | Hidden | Visible | Hidden | Enabled | ✓ Correct |

### Manual Mode (ConnectionTypeComboBox Index = 1)

| State | Discovery Button | Connect Button | Disconnect Button | Cancel Button | ConnectionTypeComboBox | Status |
|------------------|------------------|----------------|-------------------|---------------|------------------------|-----------|
| **Disconnected** | Hidden | Visible | Hidden | Hidden | Enabled | ✓ Correct |
| **Connecting** | Hidden | Hidden | Visible | Hidden | Disabled | ✓ Correct |
| **Connected** | Hidden | Hidden | Visible | Hidden | Disabled | ✓ Correct |
| **Error** | Hidden | Hidden | Visible | Hidden | Enabled | ✓ Correct |

### Fixed Bugs

**Bug #1: ConnectionTypeComboBox Enable/Disable** ✓ FIXED
- Added `IsConnectionTypeEnabled` property to ConnectViewModel
- ComboBox is now properly disabled during: Discovering, Discovered, Connecting, ConnectingManually, Connected states
- Location: `ConnectViewModel.cs:523-531`

**Bug #2: Discovery Cancelled State** ✓ FIXED
- Changed cancelled/failed discovery to use `StatusLevel.Disconnected` instead of `StatusLevel.Error`
- Start Discovery button now correctly appears after cancelling discovery
- Location: `ConnectViewModel.cs:335-348`

**Bug #3: Connecting States Missing from isConnected Check** ✓ FIXED
- Added `StatusLevel.Connecting` and `StatusLevel.ConnectingManually` to button visibility checks
- Buttons now show correct visibility during connection attempts
- Location: `ConnectViewModel.cs:479-545`

**Bug #4: Discovery Button May Appear During Connection** ✓ FIXED
- Updated StartDiscovery visibility check to account for all connecting states
- Discovery button no longer appears during connection attempts
- Location: `ConnectViewModel.cs:503-515`

**Bug #5: Disconnect Button Not Visible for Invalid Security Key Error** ✓ FIXED
- Added `StatusLevel.Error` to disconnect button visibility check
- When an invalid security key error occurs, the disconnect button is now shown
- This allows users to properly disconnect and clean up the connection state
- Location: `ConnectViewModel.cs:520-534`
- Test: `ConnectViewModelTests.cs:292-304`
Loading