From 15118727e574d3d7b4a3411bdd24244b2528485f Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Fri, 27 Aug 2021 10:54:03 +0200 Subject: [PATCH] Bluetooth server: improve display, fix error log NPE --- src/backend/BluetoothTnc.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backend/BluetoothTnc.scala b/src/backend/BluetoothTnc.scala index ed87674..f11d3c4 100644 --- a/src/backend/BluetoothTnc.scala +++ b/src/backend/BluetoothTnc.scala @@ -83,6 +83,9 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack // we are a host log("Awaiting client...") socket = ba.listenUsingRfcommWithServiceRecord("SPP", SPP).accept(-1) + val dev = socket.getRemoteDevice() + val name = if (dev.getName() != null) dev.getName() else dev.getAddress() + log("Client %s connected.".format(name)) } else if (tncchannel == -1) { log("Connecting to SPP service on %s...".format(tncmac)) @@ -110,7 +113,7 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack case e : IllegalArgumentException => service.postAbort(e.getMessage()); running = false case e : Exception => { e.printStackTrace(); - val name = if (tnc.getName() != null) tnc.getName() else tncmac + val name = if (tnc != null && tnc.getName() != null) tnc.getName() else tncmac service.postAbort(service.getString(R.string.bt_error_connect, name)) running = false; }