Double check for listeners nulls

steosoft · Sep 5, 2018 · 50aebe2 · 50aebe2
1 parent db1df73
commit 50aebe2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/...c/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothClassicService.java b/...c/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothClassicService.java
@@ -132,7 +132,8 @@ private synchronized void connected(BluetoothSocket socket, final BluetoothDevic
                 @RequiresPermission(Manifest.permission.BLUETOOTH)
                 @Override
                 public void run() {
-                    onEventCallback.onDeviceName(device.getName());
+                    if (onEventCallback != null)
+                        onEventCallback.onDeviceName(device.getName());
                 }
 
             });
@@ -193,7 +194,8 @@ private void connectionFailed() {
             runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
-                    onEventCallback.onToast("Could not connect to device");
+                    if (onEventCallback != null)
+                        onEventCallback.onToast("Could not connect to device");
                 }
             });
     }
@@ -210,7 +212,8 @@ private void connectionLost() {
             runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
-                    onEventCallback.onToast("Connection lost");
+                    if (onEventCallback != null)
+                        onEventCallback.onToast("Connection lost");
                 }
             });
     }
@@ -365,7 +368,8 @@ private void dispatchBuffer(byte[] buffer, int i) {
                 runOnMainThread(new Runnable() {
                     @Override
                     public void run() {
-                        onEventCallback.onDataRead(data, data.length);
+                        if (onEventCallback != null)
+                            onEventCallback.onDataRead(data, data.length);
                     }
                 });
             }
@@ -385,7 +389,8 @@ public void write(final byte[] buffer) {
                     runOnMainThread(new Runnable() {
                         @Override
                         public void run() {
-                            onEventCallback.onDataWrite(buffer);
+                            if (onEventCallback != null)
+                                onEventCallback.onDataWrite(buffer);
                         }
                     });
             } catch (Exception e) {
@@ -433,7 +438,8 @@ public void onReceive(Context context, Intent intent) {
                     runOnMainThread(new Runnable() {
                         @Override
                         public void run() {
-                            onScanCallback.onDeviceDiscovered(device, RSSI);
+                            if (onScanCallback != null)
+                                onScanCallback.onDeviceDiscovered(device, RSSI);
                         }
                     });
             } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
@@ -449,7 +455,8 @@ public void startScan() {
             runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
-                    onScanCallback.onStartScan();
+                    if (onScanCallback != null)
+                        onScanCallback.onStartScan();
                 }
             });
 
@@ -485,7 +492,8 @@ public void stopScan() {
             runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
-                    onScanCallback.onStopScan();
+                    if (onScanCallback != null)
+                        onScanCallback.onStopScan();
                 }
             });
     }

diff --git a/...rary/src/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothService.java b/...rary/src/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothService.java
@@ -78,7 +78,8 @@ protected synchronized void updateState(final BluetoothStatus status) {
             runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
-                    onEventCallback.onStatusChange(status);
+                    if (onEventCallback != null)
+                        onEventCallback.onStatusChange(status);
                 }
             });
     }