Merge branch 'main' of https://github.com/weliem/blessed-kotlin

README.md

@@ -37,7 +37,7 @@ The BLESSED library was inspired by CoreBluetooth on iOS and provides the same l
 
 ## Installation
 
-This library is available on Jitpack. This library also uses Timber for logging. So include the following in your gradle file:
+This library is available on Jitpack. This library also uses Timber for logging. So include the following in your gradle configuration:
 
 ```groovy
 allprojects {
@@ -54,6 +54,32 @@ dependencies {
 ```
 where `$version` is the latest published version in Jitpack [![](https://jitpack.io/v/weliem/blessed-kotlin.svg)](https://jitpack.io/#weliem/blessed-kotlin)
 
+<details>
+
+<summary>Kotlin DSL</summary>
+
+settings.gradle.kts
+
+```kotlin
+dependencyResolutionManagement {
+    repositories {
+        ...
+        maven { setUrl("https://jitpack.io") }
+    }
+}
+```
+
+build.gradle.kts
+
+```kotlin
+dependencies {
+    implementation("com.github.weliem:blessed-kotlin:$version")
+    implementation("com.jakewharton.timber:timber:5.0.1")
+}
+```
+
+</details>
+
 ## Scanning
 
 The `BluetoothCentralManager` class has several differrent scanning methods:

blessed/src/main/java/com/welie/blessed/BluetoothPeripheralManager.kt

@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentLinkedQueue
 class BluetoothPeripheralManager(private val context: Context, private val bluetoothManager: BluetoothManager, private val callback: BluetoothPeripheralManagerCallback) {
     private val mainHandler = Handler(Looper.getMainLooper())
     private val bluetoothAdapter: BluetoothAdapter = bluetoothManager.adapter
-    private val bluetoothLeAdvertiser: BluetoothLeAdvertiser = bluetoothAdapter.bluetoothLeAdvertiser
+    private val bluetoothLeAdvertiser: BluetoothLeAdvertiser by lazy { bluetoothAdapter.bluetoothLeAdvertiser }
     var isAdvertising: Boolean = false
         private set
 

peripheral/src/main/java/com/welie/btserver/MainActivity.kt

@@ -27,11 +27,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun startAdvertising() {
-        if (!isBluetoothEnabled) {
-            enableBleRequest.launch(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE))
-            return
-        }
-
         val bluetoothServer = BluetoothServer.getInstance(applicationContext)
         val peripheralManager = bluetoothServer.peripheralManager
 
@@ -40,6 +35,11 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
+        if (!isBluetoothEnabled) {
+            enableBleRequest.launch(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE))
+            return
+        }
+
         // Make sure we initialize the server only once
         if (!bluetoothServer.isInitialized) {
             bluetoothServer.initialize()