Drop ConnectionRejectedException (#771)

Author: twyatt

kable-core/api/android/kable-core.api

@@ -108,12 +108,6 @@ public final class com/juul/kable/Characteristic$Properties {
 	public final synthetic fun unbox-impl ()I
 }
 
-public final class com/juul/kable/ConnectionRejectedException : java/io/IOException {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
 public abstract interface class com/juul/kable/Descriptor {
 	public abstract fun getCharacteristicUuid ()Ljava/util/UUID;
 	public abstract fun getDescriptorUuid ()Ljava/util/UUID;

kable-core/api/jvm/kable-core.api

@@ -63,12 +63,6 @@ public final class com/juul/kable/Characteristic$Properties {
 	public final synthetic fun unbox-impl ()I
 }
 
-public final class com/juul/kable/ConnectionRejectedException : java/io/IOException {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
 public abstract interface class com/juul/kable/Descriptor {
 	public abstract fun getCharacteristicUuid ()Ljava/util/UUID;
 	public abstract fun getDescriptorUuid ()Ljava/util/UUID;

kable-core/src/androidMain/kotlin/BluetoothDevice.kt

@@ -16,6 +16,7 @@ import com.juul.kable.gatt.Callback
 import com.juul.kable.logs.Logging
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.io.IOException
 import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
@@ -36,7 +37,7 @@ internal fun BluetoothDevice.connect(
     logging: Logging,
     threadingStrategy: ThreadingStrategy,
     disconnectTimeout: Duration,
-): Connection? {
+): Connection {
     val callback = Callback(state, mtu, onCharacteristicChanged, logging, address)
     val threading = threadingStrategy.acquire()
 
@@ -52,17 +53,12 @@ internal fun BluetoothDevice.connect(
                     ?: connectGattCompat(context, true, callback, transport.intValue)
 
             else -> connectGattCompat(context, autoConnect, callback, transport.intValue)
-        }
+        } ?: throw IOException("Binder remote-invocation error")
     } catch (t: Throwable) {
         threading.release()
         throw t
     }
 
-    if (bluetoothGatt == null) {
-        threading.release()
-        return null
-    }
-
     return Connection(coroutineContext, bluetoothGatt, threading, callback, services, disconnectTimeout, logging)
 }
 

kable-core/src/androidMain/kotlin/BluetoothDeviceAndroidPeripheral.kt

@@ -21,7 +21,9 @@ import com.juul.kable.State.Disconnected
 import com.juul.kable.WriteType.WithResponse
 import com.juul.kable.WriteType.WithoutResponse
 import com.juul.kable.bluetooth.checkBluetoothIsOn
+import com.juul.kable.bluetooth.checkBluetoothIsSupported
 import com.juul.kable.bluetooth.clientCharacteristicConfigUuid
+import com.juul.kable.bluetooth.requireNonZeroAddress
 import com.juul.kable.gatt.Response.OnCharacteristicRead
 import com.juul.kable.gatt.Response.OnCharacteristicWrite
 import com.juul.kable.gatt.Response.OnDescriptorRead
@@ -92,13 +94,14 @@ internal class BluetoothDeviceAndroidPeripheral(
     override val type: Type
         get() = typeFrom(bluetoothDevice.type)
 
-    override val address: String = bluetoothDevice.address
+    override val address: String = requireNonZeroAddress(bluetoothDevice.address)
 
     @ExperimentalApi
     override val name: String?
         get() = bluetoothDevice.name
 
     private suspend fun establishConnection(scope: CoroutineScope): CoroutineScope {
+        checkBluetoothIsSupported()
         checkBluetoothIsOn()
 
         logger.info { message = "Connecting" }
@@ -118,7 +121,7 @@ internal class BluetoothDeviceAndroidPeripheral(
                 logging,
                 threadingStrategy,
                 disconnectTimeout,
-            ) ?: throw ConnectionRejectedException()
+            )
 
             suspendUntil<State.Connecting.Services>()
             discoverServices()

kable-core/src/androidMain/kotlin/bluetooth/CheckMacAddress.kt

@@ -0,0 +1,11 @@
+package com.juul.kable.bluetooth
+
+import android.bluetooth.BluetoothDevice
+
+private const val ZERO_MAC_ADDRESS = "00:00:00:00:00:00"
+
+/** Performs the same MAC address validation as performed in [BluetoothDevice.connectGatt]. */
+internal fun requireNonZeroAddress(address: String): String {
+    require(ZERO_MAC_ADDRESS != address) { "Invalid address: $address" }
+    return address
+}

…core/src/commonMain/kotlin/Exceptions.kt …commonMain/kotlin/GattStatusException.ktkable-core/src/commonMain/kotlin/Exceptions.kt renamed to kable-core/src/commonMain/kotlin/GattStatusException.kt kable-core/src/commonMain/kotlin/Exceptions.kt renamed to kable-core/src/commonMain/kotlin/GattStatusException.kt

@@ -2,11 +2,6 @@ package com.juul.kable
 
 import kotlinx.io.IOException
 
-public class ConnectionRejectedException(
-    message: String? = null,
-    cause: Throwable? = null,
-) : IOException(message, cause)
-
 public class GattStatusException(
     message: String? = null,
     cause: Throwable? = null,

kable-core/src/commonMain/kotlin/Peripheral.kt

@@ -119,7 +119,9 @@ public interface Peripheral : CoroutineScope {
      * supervisor scope, meaning any failures in launched coroutines will not fail other launched
      * coroutines nor cause a disconnect.
      *
-     * @throws ConnectionRejectedException when a connection request is rejected by the system (e.g. bluetooth hardware unavailable).
+     * @throws IllegalStateException when a connection request could not be made (e.g. bluetooth not supported).
+     * @throws NotConnectedException if unable to establish connection (e.g. connection lost while discovering services).
+     * @throws IOException (Android) if request failed due to Binder remote-invocation error.
      * @throws CancellationException if [Peripheral]'s [CoroutineScope] has been [cancelled][Peripheral.cancel].
      */
     public suspend fun connect(): CoroutineScope

kable-core/src/commonMain/kotlin/bluetooth/CheckBluetoothIsSupported.kt

@@ -0,0 +1,5 @@
+package com.juul.kable.bluetooth
+
+internal suspend fun checkBluetoothIsSupported() {
+    check(isSupported()) { "Bluetooth not supported" }
+}