From 3db009e77dab0d83a2d0dcb3b6595f6b95a43b35 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 2 Dec 2016 23:38:54 +0100
Subject: [PATCH] Pebble: do not dump all LE traffic, minor code cleanups

---
 .../service/devices/pebble/PebbleIoThread.java         | 10 ++++------
 .../service/devices/pebble/ble/PebbleGATTServer.java   |  6 ++----
 .../service/devices/pebble/ble/PebbleLESupport.java    |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
index 6df1a3dd..b5413933 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
@@ -195,7 +195,7 @@ class PebbleIoThread extends GBDeviceIoThread {
                 }
                 BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(deviceAddress);
                 if (btDevice.getType() == BluetoothDevice.DEVICE_TYPE_LE) {
-                    LOG.info("Ok this seems to be a LE Pebble, try LE Support, trouble ahead!");
+                    LOG.info("This is a Pebble 2 or Pebble-LE/Pebble Time LE, will use BLE");
                     mInStream = new PipedInputStream();
                     mOutStream = new PipedOutputStream();
                     mPebbleLESupport = new PebbleLESupport(this.getContext(), btDevice, (PipedInputStream) mInStream, (PipedOutputStream) mOutStream);
@@ -238,7 +238,7 @@ class PebbleIoThread extends GBDeviceIoThread {
     public void run() {
         mIsConnected = connect();
         if (!mIsConnected) {
-            if (GBApplication.getGBPrefs().getAutoReconnect()) {
+            if (GBApplication.getGBPrefs().getAutoReconnect() && !mQuit) {
                 gbDevice.setState(GBDevice.State.WAITING_FOR_RECONNECT);
                 gbDevice.sendDeviceUpdateIntent(getContext());
             }
@@ -723,16 +723,14 @@ class PebbleIoThread extends GBDeviceIoThread {
         if (mBtSocket != null) {
             try {
                 mBtSocket.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException ignored) {
             }
             mBtSocket = null;
         }
         if (mTCPSocket != null) {
             try {
                 mTCPSocket.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException ignored) {
             }
             mTCPSocket = null;
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
index 384c656a..2e0e0684 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
@@ -57,15 +57,13 @@ class PebbleGATTServer extends BluetoothGattServerCallback {
     }
 
     synchronized void sendDataToPebble(byte[] data) {
-        LOG.info("send data to pebble " + GB.hexdump(data, 0, -1));
+        //LOG.info("send data to pebble " + GB.hexdump(data, 0, -1));
         writeCharacteristics.setValue(data.clone());
 
         mBluetoothGattServer.notifyCharacteristicChanged(mBtDevice, writeCharacteristics, false);
     }
 
     synchronized private void sendAckToPebble(int serial) {
-        LOG.info("send ack to pebble for serial " + serial);
-
         writeCharacteristics.setValue(new byte[]{(byte) (((serial << 3) | 1) & 0xff)});
 
         mBluetoothGattServer.notifyCharacteristicChanged(mBtDevice, writeCharacteristics, false);
@@ -109,7 +107,7 @@ class PebbleGATTServer extends BluetoothGattServerCallback {
                 mPebbleLESupport.notify();
             }
         }
-        LOG.info("write request: offset = " + offset + " value = " + GB.hexdump(value, 0, -1));
+        //LOG.info("write request: offset = " + offset + " value = " + GB.hexdump(value, 0, -1));
         int header = value[0] & 0xff;
         int command = header & 7;
         int serial = header >> 3;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
index fcc27415..6fa3d2c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
@@ -46,7 +46,7 @@ public class PebbleLESupport {
             }
         }
         this.close();
-        throw new IOException("conntection failed");
+        throw new IOException("connection failed");
     }
 
     void writeToPipedOutputStream(byte[] value, int offset, int count) {