Merge pull request #11 from Dilivva/development

Fix bug with state issues regarding printer connection
Dilivva · Jun 15, 2024 · c5753f4 · c5753f4
2 parents 185f005 + def5261
commit c5753f4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -53,7 +53,7 @@ android {
 @Suppress("UnstableApiUsage")
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.S01, true)
-    val versionTxt = "0.0.7"
+    val versionTxt = "0.0.8"
     val isDev = findProperty("env")?.equals("dev") ?: false
     val version = if (isDev) "0.0.1-SNAPSHOT" else versionTxt
 

diff --git a/...ndroidMain/kotlin/com/dilivva/blueline/connection/bluetooth/AndroidBluetoothConnection.kt b/...ndroidMain/kotlin/com/dilivva/blueline/connection/bluetooth/AndroidBluetoothConnection.kt
@@ -97,7 +97,7 @@ internal class AndroidBluetoothConnection: BlueLine {
 
         override fun onConnectionStateChange(gatt: BluetoothGatt?, status: Int, newState: Int) {
             if (newState == BluetoothProfile.STATE_CONNECTED) {
-                stateFlow.update { state -> state.copy(isConnected = true, isConnecting = false) }
+                stateFlow.update { state -> state.copy(isConnected = true, isConnecting = false, bluetoothConnectionError = null) }
                 gatt?.discoverServices()
             }else{
                 stateFlow.update {
@@ -189,7 +189,7 @@ internal class AndroidBluetoothConnection: BlueLine {
     }
 
     override fun connect() {
-        stateFlow.update { it.copy(isConnecting = true) }
+        stateFlow.update { it.copy(isConnecting = true, bluetoothConnectionError = null) }
         val state = stateFlow.value
         if (!state.isBluetoothReady || state.isConnected){
             return

diff --git a/library/src/commonMain/kotlin/com/dilivva/blueline/connection/bluetooth/BlueLine.kt b/library/src/commonMain/kotlin/com/dilivva/blueline/connection/bluetooth/BlueLine.kt
@@ -63,7 +63,7 @@ interface BlueLine {
      *  * Call [init] before scanning to ensure Bluetooth is ready.
      *  * This method prioritizes the first discovered printer and might ignore others. Consider revising this behavior if you need to select a specific printer.
      *
-     * @throws CancellationException if the coroutine is cancelled during the scan.
+     * @throws [CancellationException] if the coroutine is cancelled during the scan.
      */
     suspend fun scanForPrinters()
 

diff --git a/library/src/commonMain/kotlin/com/dilivva/blueline/connection/bluetooth/Connection.kt b/library/src/commonMain/kotlin/com/dilivva/blueline/connection/bluetooth/Connection.kt
@@ -64,6 +64,7 @@ enum class ConnectionError {
  * @property bluetoothConnectionError An optional `ConnectionError` object containing details about any errors encountered during Bluetooth connection attempts.
  * @property isPrinting Indicates if a print job is currently being sent to the printer.
  * @property isScanning Indicates if the system is actively searching for printers (relevant for discovery phase).
+ * @property isConnecting Indicates if the system is attempting to connect to the printer
  */
 data class ConnectionState(
     val deviceName: String = "Searching",

diff --git a/...ry/src/iosMain/kotlin/com/dilivva/blueline/connection/bluetooth/IosBluetoothConnection.kt b/...ry/src/iosMain/kotlin/com/dilivva/blueline/connection/bluetooth/IosBluetoothConnection.kt
@@ -59,7 +59,7 @@ internal object IosBluetoothConnection: BlueLine {
             stateFlow.update { state -> state.copy(deviceName = device.name.orEmpty(), discoveredPrinter = true, isScanning = false) }
         },
         onConnection = {
-            stateFlow.update { state -> state.copy(isConnected = it, isConnecting = false) }
+            stateFlow.update { state -> state.copy(isConnected = it, isConnecting = false, bluetoothConnectionError = if (it) null else ConnectionError.BLUETOOTH_PRINTER_DEVICE_NOT_FOUND) }
         },
         onBluetoothReady = {
             stateFlow.update { state ->
@@ -71,7 +71,7 @@ internal object IosBluetoothConnection: BlueLine {
     private val peripheralManager = PeripheralManager(
         onCharacter = { character ->
             characteristic = character
-            stateFlow.update { state -> state.copy(canPrint = true, isConnecting = false) }
+            stateFlow.update { state -> state.copy(canPrint = true) }
             val mtu = peripheral?.maximumWriteValueLengthForType(CBCharacteristicWriteWithResponse)?.toInt()
             printerHelper.mtu = mtu ?: 20
         },
@@ -121,7 +121,7 @@ internal object IosBluetoothConnection: BlueLine {
     }
 
     override fun connect() {
-        stateFlow.update { it.copy(isConnecting = true) }
+        stateFlow.update { it.copy(isConnecting = true, bluetoothConnectionError = null) }
         val state = stateFlow.value
         if (!state.isBluetoothReady || state.isConnected){
             return

diff --git a/library/src/iosMain/kotlin/com/dilivva/blueline/connection/bluetooth/ScanningManager.kt b/library/src/iosMain/kotlin/com/dilivva/blueline/connection/bluetooth/ScanningManager.kt
@@ -79,7 +79,6 @@ internal class ScanningManager(
         didDisconnectPeripheral: CBPeripheral,
         error: NSError?
     ) {
-        println("Disconnected")
         onConnection(false)
     }