Better handling of default adapter and initialization

Signed-off-by: Petre Eftime <[email protected]>

1 files changed, 3 insertions, 4 deletions

diff --git a/java/jni/BluetoothManager.cxx b/java/jni/BluetoothManager.cxx
index 917961c..ecc56c7 100644
--- a/java/jni/BluetoothManager.cxx
+++ b/java/jni/BluetoothManager.cxx
@@ -160,14 +160,13 @@ jobject Java_tinyb_BluetoothManager_getServices(JNIEnv *env, jobject obj)
 
 jboolean Java_tinyb_BluetoothManager_setDefaultAdapter(JNIEnv *env, jobject obj, jobject adapter)
 {
-    if (!adapter)
-    {
+    if (adapter == nullptr)
         throw std::invalid_argument("adapter argument is null\n");
-    }
+
     BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
     BluetoothAdapter *b_adapter = getInstance<BluetoothAdapter>(env, adapter);
 
-    return manager->set_default_adapter(b_adapter);
+    return manager->set_default_adapter(*b_adapter);
 }
 
 jboolean Java_tinyb_BluetoothManager_startDiscovery(JNIEnv *env, jobject obj)