Prevent NPE in SdlDeviceListener (#1789)

Robert Henigan · web-flow · commit e5398b4b4bf7 · 2022-02-16T14:39:07.000-05:00
* Add null check

* set bluetoothHandler to null
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
@@ -259,8 +259,11 @@ public void notifyConnection(VehicleType vehicleType) {
             AndroidTools.saveVehicleType(sdlListener.contextWeakReference.get(), vehicleType, sdlListener.connectedDevice.getAddress());
             boolean keepConnectionOpen = sdlListener.callback.onTransportConnected(sdlListener.contextWeakReference.get(), sdlListener.connectedDevice);
             if (!keepConnectionOpen) {
-                sdlListener.bluetoothTransport.stop();
-                sdlListener.bluetoothTransport = null;
+                if (sdlListener.bluetoothTransport != null) {
+                    sdlListener.bluetoothTransport.stop();
+                    sdlListener.bluetoothTransport = null;
+                    sdlListener.bluetoothHandler = null;
+                }
                 sdlListener.timeoutHandler.removeCallbacks(sdlListener.timeoutRunner);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,11 @@ public void notifyConnection(VehicleType vehicleType) {`
`259`	`259`	`AndroidTools.saveVehicleType(sdlListener.contextWeakReference.get(), vehicleType, sdlListener.connectedDevice.getAddress());`
`260`	`260`	`boolean keepConnectionOpen = sdlListener.callback.onTransportConnected(sdlListener.contextWeakReference.get(), sdlListener.connectedDevice);`
`261`	`261`	`if (!keepConnectionOpen) {`
`262`		`- sdlListener.bluetoothTransport.stop();`
`263`		`- sdlListener.bluetoothTransport = null;`
	`262`	`+ if (sdlListener.bluetoothTransport != null) {`
	`263`	`+ sdlListener.bluetoothTransport.stop();`
	`264`	`+ sdlListener.bluetoothTransport = null;`
	`265`	`+ sdlListener.bluetoothHandler = null;`
	`266`	`+ }`
`264`	`267`	`sdlListener.timeoutHandler.removeCallbacks(sdlListener.timeoutRunner);`
`265`	`268`	`}`
`266`	`269`	`}`