fixed initialization when we want to use a custom message parser

neoBortx · Feb 3, 2024 · dee915a · dee915a
1 parent 4ab325f
commit dee915a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-VERSION_LIB=0.0.9
+VERSION_LIB=0.0.10
diff --git a/simpleBleClient/src/main/java/com/bortxapps/simplebleclient/api/SimpleBleClientBuilder.kt b/simpleBleClient/src/main/java/com/bortxapps/simplebleclient/api/SimpleBleClientBuilder.kt
@@ -106,7 +106,6 @@ public class SimpleBleClientBuilder {
     }
 
     private fun buildInstance(context: Context): SimpleBleClient {
-        bleLibraryContainer.init(context)
 
         with(bleLibraryContainer.getBleConfiguration()) {
             operationTimeOutMillisConf?.let { operationTimeoutMillis = it }
@@ -116,6 +115,8 @@ public class SimpleBleClientBuilder {
             messageBufferRetriesConf?.let { messageBufferRetries = it }
         }
 
+        bleLibraryContainer.init(context)
+
         with(bleLibraryContainer) {
             return SimpleBleClientFactory(
                 context.applicationContext,

diff --git a/simpleBleClient/src/main/java/com/bortxapps/simplebleclient/di/BleLibraryContainer.kt b/simpleBleClient/src/main/java/com/bortxapps/simplebleclient/di/BleLibraryContainer.kt
@@ -20,26 +20,23 @@ import com.bortxapps.simplebleclient.scanner.BleDeviceScannerSettingsBuilder
 import kotlinx.coroutines.sync.Mutex
 
 internal class BleLibraryContainer {
-    private lateinit var blueToothScanner: BluetoothLeScanner
-    private lateinit var bleConfiguration: BleConfiguration
+    private var bleConfiguration = BleConfiguration()
 
+    private lateinit var blueToothScanner: BluetoothLeScanner
     private lateinit var bleDeviceScannerManager: BleDeviceScannerManager
     private lateinit var bleManagerGattCallBacks: BleManagerGattCallBacks
     private lateinit var bleManagerDeviceSearchOperations: BleManagerDeviceSearchOperations
     private lateinit var bleManagerGattConnectionOperations: BleManagerGattConnectionOperations
     private lateinit var bleManagerGattSubscriptions: BleManagerGattSubscriptions
     private lateinit var bleManagerGattWriteOperations: BleManagerGattWriteOperations
     private lateinit var bleManagerGattReadOperations: BleManagerGattReadOperations
-
     private lateinit var gattMutex: Mutex
     private lateinit var buildVersionProvider: BuildVersionProvider
     private lateinit var bleMessageProcessorProvider: BleMessageProcessorProvider
 
     fun init(context: Context) {
         gattMutex = Mutex()
 
-        bleConfiguration = BleConfiguration()
-
         bleMessageProcessorProvider = BleMessageProcessorProvider(bleConfiguration)
 
         buildVersionProvider = BuildVersionProvider()
@@ -87,9 +84,6 @@ internal class BleLibraryContainer {
     }
 
     fun getBleConfiguration(): BleConfiguration {
-        if (::bleConfiguration.isInitialized.not()) {
-            throw SimpleBleClientException(BleError.LIBRARY_NOT_INITIALIZED)
-        }
         return bleConfiguration
     }