This commit refactors the BLE connection and error handling logic for better stability and clarity.

Key changes include:
- A new `connectAndAwait` function in `BleConnection` which attempts to connect and waits for a definitive `Connected` or `Disconnected` state, throwing a specific `BleError` on failure or timeout.
- A simplified and more robust `BleError` sealed class to provide clearer error information.
- Updated `BleOtaTransport` and `NordicBleInterface` to use `connectAndAwait`, replacing manual timeout and state handling with a more streamlined approach.
- Service discovery in `BleConnection` now includes a timeout to prevent indefinite hangs.
- Corrected a typo in `libs.versions.toml` for the `coil-svg` dependency.

Signed-off-by: James Rich <[email protected]>

This commit refactors the BLE OTA transport test to be more robust and realistic.

- Switched from `StandardTestDispatcher` to `UnconfinedTestDispatcher` for more reliable coroutine testing.
- Enhanced the mock peripheral to accurately simulate the OTA protocol, including tracking received bytes and sending the final "OK" message correctly after all data chunks are received.
- Made the test data size smaller and configurable for faster test execution.
- Changed the response channel in `BleOtaTransport` to `UNLIMITED` to prevent potential deadlocks during testing.
- Fixed a dependency scope in the `intro` feature module.

Signed-off-by: James Rich <[email protected]>

This commit updates the `nordic-ble` library from version `2.0.0-alpha12` to `2.0.0-alpha14`.

Key changes include:
- Integrating `AndroidEnvironment` to manage Bluetooth state and permissions, replacing the custom `BluetoothBroadcastReceiver`.
- Updating BLE module dependencies and providing `AndroidEnvironment` via dependency injection.
- Adding the `-Xskip-prerelease-check` Kotlin compiler option to support the alpha library version.

Signed-off-by: James Rich <[email protected]>

Adds unit tests for the `BluetoothRepository` to verify its core functionalities.

- Introduces tests for the initial state, state updates on Bluetooth power changes, device scanning, and bonded device discovery.
- Adds `androidx.lifecycle:lifecycle-runtime-testing` for testing Lifecycle-aware components.
- Updates Nordic BLE mock dependency names for consistency (`client-mock` to `client-core-mock`).
- Implements the tests using the Nordic BLE mock environment to simulate peripheral devices and Central Manager behavior.

Signed-off-by: James Rich <[email protected]>

Decouples the `BleScanner` from the `BluetoothRepository` by introducing it as a constructor dependency. This change improves testability by allowing `BleScanner` to be mocked in `BluetoothRepositoryTest`.

The tests have been refactored to use mocks for `BleScanner`, enabling more focused and reliable testing of the repository's logic without relying on the specifics of the BLE scanning implementation. The `BleScanner` class is also updated with an `@Inject` annotation to support dependency injection.

Signed-off-by: James Rich <[email protected]>

The test `drainPacketQueueAndDispatch` was previously ignored due to intermittent failures related to timing in the Nordic BLE mock library. This commit re-enables the test by removing the `@Ignore` annotation.

Signed-off-by: James Rich <[email protected]>

Signed-off-by: James Rich <[email protected]>

This commit introduces several modern Android development practices to improve the `MainActivity` and related components:

-   **Enable Predictive Back Gesture**: Enables the new predictive back gesture introduced in Android 13 by setting `enableOnBackInvokedCallback="true"` in the `AndroidManifest.xml`.
-   **Modernize Intent Handling**: Replaces the deprecated `onNewIntent` override with `addOnNewIntentListener`. Uses `IntentCompat` for type-safe handling of `Parcelable` extras from NFC intents.
-   **Improve Edge-to-Edge Display**: Updates `enableEdgeToEdge` to provide theme-aware (dark/light) system bar styling for a more seamless UI.
-   **Optimize Startup**: Implements `ReportDrawnWhen` to signal to the system when the UI is fully drawn, improving startup performance measurement.
-   **Clean Up Splash Screen**: Simplifies the splash screen theme (`styles.xml`) and removes the obsolete `colors.xml` file by referencing `android:color/black` directly in the splash icon drawable.
-   **Use Lifecycle-Aware Coroutines**: Migrates from `collectAsState` to `collectAsStateWithLifecycle` for more efficient and safer UI state collection.
-   **Fix Bitwise Operation**: Corrects a logical error in `MeshServiceClient` by using the bitwise `or` operator instead of `+` for combining service binding flags.

Signed-off-by: James Rich <[email protected]>

Closes the MeshServiceClient connection when the app enters the stopped state. This is done by implementing the `onStop` lifecycle callback to call `close()`.

Signed-off-by: James Rich <[email protected]>

# Conflicts:
#	app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt

This commit introduces significant improvements to the stability of Bluetooth Low Energy (BLE) connections and refactors the testing infrastructure.

A race condition in the Firmware Over-the-Air (OTA) update process has been resolved. Previously, a very fast device could send a response before the client was ready to listen, causing the update to fail. By waiting for the notification subscription to be fully established before proceeding, this issue is now fixed.

Similarly, the main radio connection logic has been hardened. The connection process now explicitly waits for all required characteristic notifications to be successfully subscribed before considering the connection complete. This prevents race conditions and ensures the link is fully operational.

The testing framework has been updated to use the more advanced `MockAndroidEnvironment` from the Nordic BLE library. This provides a more realistic and robust simulation of the BLE stack, improving the reliability of our tests.

Finally, a deprecated `ZoneIdExtensions.kt` file has been removed, and the dependencies for the Nordic BLE library have been updated.

**BREAKING CHANGE:** The `nordic-log` dependency has been removed. All tests now use the `MockAndroidEnvironment` for BLE simulation. This might require adjustments in downstream modules or test configurations that relied on the previous setup.

Signed-off-by: James Rich <[email protected]>

This commit introduces several UI enhancements to the Connections screen for a more polished and consistent user experience. It also adds foundational UI tests for this screen.

Key changes include:

-   **Consistent Sizing and Spacing:** The layout of the `ConnectingDeviceInfo` and `DeviceListItem` components has been refined with standardized spacing, padding, and typography to align with the Material Design style. Progress indicators and icons have also been resized for better visual balance.
-   **Improved BLE Device Display:** BLE devices in the list are now wrapped in `Card` elements for better visual separation.
-   **Throttled RSSI Updates:** The RSSI value displayed for BLE devices is now updated at a throttled rate to reduce visual noise and align with the device's polling frequency.
-   **Scrollable Device Lists:** The device lists for TCP and USB connections are now independently scrollable, preventing the entire screen from scrolling and keeping the connection type tabs visible.
-   **Refactored NetworkDevices Composable:** The logic for displaying network devices has been extracted into an internal, previewable composable function (`NetworkDevicesInternal`), improving testability and code organization.
-   **UI Test Infrastructure:** Added new instrumentation tests for the `ConnectionsScreen` using `MockAndroidEnvironment` to simulate different Bluetooth states (enabled/disabled) and verify the UI's response. Corresponding test dependencies have been added to the build configuration.

Signed-off-by: James Rich <[email protected]>

This commit enhances the device connection screen by displaying associated node information (long name and short name) for each discovered or saved device.

When a device is found via BLE, USB, or TCP, the app now attempts to find a matching node from the current node database. If a match is found, the node's chip, showing its long and short name, is displayed next to the device name in the list. This provides users with more context about the devices they are connecting to.

The matching logic is specific to the connection type:
- **BLE:** Matches using the device's short name from its advertisement data.
- **TCP (mDNS):** Matches using the node ID from the mDNS TXT record.
- **USB & Recent TCP:** Attempts to match using the last part of the device name (e.g., the `_xxxx` suffix).

To support this, the `DeviceListEntry` data structure has been updated to include an optional `Node` property.

Signed-off-by: James Rich <[email protected]>

This commit refactors the device connection screen for a cleaner and more consistent user experience, and improves how Bluetooth devices are named.

The "Available Bluetooth Devices" and "Recent Network Devices" lists have been updated to use a consistent card-based layout with a shared headline style. The previous `TitledCard` has been replaced with a standard `Card` and `Text` combination for better visual alignment with the rest of the UI.

In the string resources, "BLE Devices" has been renamed to "Available Bluetooth Devices" for clarity. Additionally, a new "Friendly address" string has been introduced.

Signed-off-by: James Rich <[email protected]>

This commit refactors the connection management logic by separating the concerns of BLE device scanning from the broader connection and device management.

A new `ScannerViewModel` has been created to handle the presentation logic for all connection types (BLE, USB, TCP), replacing the monolithic `BTScanModel`. The responsibility for initiating and managing BLE scans has been moved from the `BluetoothRepository` to the `ScannerView` composable, leveraging the Nordic `ScannerView` component for a more standard and encapsulated implementation.

This change simplifies the `BluetoothRepository` by removing scanning-related flows and logic, allowing it to focus solely on managing Bluetooth state and bonding.

Key changes:
- `BTScanModel` has been deleted and replaced by `ScannerViewModel`.
- `BluetoothRepository` no longer handles BLE scanning; this is now managed by the `ScannerView`.
- The `ConnectionsScreen` and related composables have been updated to use `ScannerViewModel`.
- Unused flows and properties in `UsbRepository` and `UIViewModel` have been removed.

BREAKING CHANGE: The `BTScanModel` class has been removed and its responsibilities have been refactored into `ScannerViewModel` and the `ScannerView` UI component. The `BluetoothRepository` API has changed, as it no longer provides BLE scanning functionality. Downstream dependencies on `BTScanModel` or the scanning methods in `BluetoothRepository` will need to be updated.

Signed-off-by: James Rich <[email protected]>

This commit centralizes common utility classes and functions from the `app` module into a new `core/common` module. This consolidation removes duplicated code, improves modularity, and simplifies dependencies across the feature modules.

Key changes include:
- **Creation of `core/common` module**: A new module to house shared, platform-agnostic and platform-specific utilities.
- **Moved utility classes**:
    - `BuildUtils`, `DebugLogFile`, `BinaryLogFile`, `DateUtils` and `Utf8ByteLengthFilter` moved to `core/common`.
    - Concurrency helpers like `ServiceClient`, `SequentialJob`, `SyncContinuation`, `DeferredExecution`, and `handledLaunch` are now in `core/common`.
    - Exception handling utilities (`Exceptions`, `exceptionReporter`, `toRemoteExceptions`) have been centralized.
- **Relocated extension functions**:
    - `Modifier.thenIf` moved to `core/ui`.
    - Time-related extensions (`nowMillis`, `nowSeconds`, etc.) are now in `core/common`.
    - `getInitials` logic moved into `core/model`.
- **Dependency updates**: `build.gradle.kts` files across various modules (`core/data`, `core/service`, `core/ui`, `feature/node`, etc.) have been updated to depend on the new `core/common` module.
- **Code cleanup**:
    - Removed `ExperimentalMaterial3ExpressiveApi` annotation as it is no longer needed. Replaced `CircularWavyProgressIndicator` with `CircularProgressIndicator`.
    - Renamed `UIState.kt` to `UIViewModel.kt` for clarity.
    - Simplified Paging 3 related code in `ContactsScreen` for better readability.

This refactoring reduces code duplication and establishes a clearer architectural pattern for shared utilities, making the codebase more maintainable and scalable.

Signed-off-by: James Rich <[email protected]>

This commit introduces `ServiceClient`, a new class designed to manage the lifecycle of a bound Android service connection in a more robust and testable way.

The `ServiceClient` handles the complexities of binding to a service, including:
- Retrying the bind operation on initial failure.
- Throwing a `BindFailedException` after multiple failed attempts.
- Providing a `waitConnect()` method that blocks until the service is successfully connected, which is useful for ensuring the service is ready before use.
- Managing unbinding when `close()` is called.

Comprehensive unit tests (`ServiceClientTest`) have been added to validate this new functionality, covering successful connections, retry logic, connection waiting, and the unbinding process.

Additionally, a minor refactoring was done in `MigrationTest.kt` to update an import path for `nowMillis`, moving it to the `core.common` package.

Signed-off-by: James Rich <[email protected]>

This commit introduces comprehensive documentation for the project's architecture and the modernized Bluetooth Low Energy (BLE) stack.

The main `README.md` has been updated to include a high-level overview of the app's architecture, covering UI, state management, dependency injection, navigation, and the data layer. It also now points to the new BLE documentation.

A detailed `README.md` has been added to the `core/ble` module. This new file explains the move to Nordic Semiconductor's Coroutine-based BLE libraries, replacing the legacy implementation. It outlines the key components of the new stack, including `NordicBleInterface`, `BluetoothRepository`, and `BleConnection`, and provides guidance on architecture and testing within the module.

Finally, the `AGENTS.md` file, which serves as a guide for contributors, has been updated to reflect these architectural changes. It now includes a dedicated section for the new BLE stack, directing developers to use the modern abstractions and avoid legacy APIs.

Signed-off-by: James Rich <[email protected]>

This commit populates the `README.md` file for each module with a detailed overview, a description of its key components, and an auto-generated Mermaid dependency graph.

This documentation provides a high-level understanding of each module's role within the application architecture.

Additionally, the `build-logic` for graph generation has been improved to correctly identify Android Feature modules and ensure the README files are updated only when the graph content changes.

The `CONTRIBUTING.md` has also been updated to reflect the new, centralized string resource management in the `:core:strings` module.

Signed-off-by: James Rich <[email protected]>

This commit refactors the project's testing infrastructure to improve consistency and maintainability.

Key changes include:
- A legacy UI test, `ConnectionScreenTest.kt`, has been removed as its functionality is now covered by more modern tests utilizing `MockAndroidEnvironment`.
- The `getInitials` utility function has been moved from the `app` module to `core.model.util` to be accessible across the project.
- Time-related utility functions like `nowMillis`, `nowSeconds`, etc., have been relocated from `core.model.util` to a new `core.common.util` module.
- The project's Android Gradle Plugin has been updated, enabling `isIncludeAndroidResources = true` for unit tests, which allows them to access Android resources.
- String resource fetching in tests has been standardized to use `org.meshtastic.core.strings.getString`.
- A dummy Maps API key has been added to the "google" product flavor's manifest placeholders to prevent build failures in environments without a `secrets.properties` file.
- The SDK version for `MeshServiceBroadcastsTest` has been explicitly set to 34.

**BREAKING CHANGE:** The `getInitials()` and various time utility functions (`nowMillis`, `toInstant`, etc.) have moved. Downstream modules and tests must update their imports to use the new locations in `org.meshtastic.core.model.util.getInitials` and `org.meshtastic.core.common.util` respectively.

Signed-off-by: James Rich <[email protected]>