From 7ad1bfbdb113164db00a6de20d5f968f43ac5084 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 14 Apr 2015 10:29:09 +0200 Subject: [PATCH] reformat code with androidstudio --- .../gadgetbridge/AbstractBTDeviceSupport.java | 10 +++++----- .../gadgetbridge/AbstractBTLEDeviceSupport.java | 2 -- .../gadgetbridge/AbstractDeviceSupport.java | 6 +++--- .../gadgetbridge/BluetoothCommunicationService.java | 9 +++++---- .../freeyourgadget/gadgetbridge/DeviceSupport.java | 6 +++--- .../gadgetbridge/miband/MiBandSupport.java | 2 +- .../gadgetbridge/pebble/PebbleSupport.java | 2 -- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTDeviceSupport.java index a76e45bf..ae1992b1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTDeviceSupport.java @@ -10,7 +10,7 @@ public abstract class AbstractBTDeviceSupport extends AbstractDeviceSupport { protected abstract GBDeviceProtocol createDeviceProtocol(); protected abstract GBDeviceIoThread createDeviceIOThread(); - + @Override public void dispose() { // currently only one thread allowed @@ -24,27 +24,27 @@ public abstract class AbstractBTDeviceSupport extends AbstractDeviceSupport { gbDeviceIOThread = null; } } - + public synchronized GBDeviceProtocol getDeviceProtocol() { if (gbDeviceProtocol == null) { gbDeviceProtocol = createDeviceProtocol(); } return gbDeviceProtocol; } - + public synchronized GBDeviceIoThread getDeviceIOThread() { if (gbDeviceIOThread == null) { gbDeviceIOThread = createDeviceIOThread(); } return gbDeviceIOThread; } - + protected void sendToDevice(byte[] bytes) { if (bytes != null && gbDeviceIOThread != null) { gbDeviceIOThread.write(bytes); } } - + @Override public void onSMS(String from, String body) { byte[] bytes = gbDeviceProtocol.encodeSMS(from, body); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTLEDeviceSupport.java index d3a22b1b..11991d0d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTLEDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTLEDeviceSupport.java @@ -1,9 +1,7 @@ package nodomain.freeyourgadget.gadgetbridge; - public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport { - } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractDeviceSupport.java index 14bb01f1..b0054b54 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractDeviceSupport.java @@ -13,17 +13,17 @@ public abstract class AbstractDeviceSupport implements DeviceSupport { this.btAdapter = btAdapter; this.context = context; } - + @Override public GBDevice getDevice() { return gbDevice; } - + @Override public BluetoothAdapter getBluetoothAdapter() { return btAdapter; } - + @Override public Context getContext() { return context; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java index 83f59445..cfcf1fd5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java @@ -1,9 +1,5 @@ package nodomain.freeyourgadget.gadgetbridge; -import nodomain.freeyourgadget.gadgetbridge.GBDevice.State; -import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport; -import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleIoThread; -import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport; import android.app.NotificationManager; import android.app.Service; import android.bluetooth.BluetoothAdapter; @@ -20,6 +16,11 @@ import android.provider.ContactsContract; import android.util.Log; import android.widget.Toast; +import nodomain.freeyourgadget.gadgetbridge.GBDevice.State; +import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport; +import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleIoThread; +import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport; + public class BluetoothCommunicationService extends Service { public static final String ACTION_START = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.start"; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceSupport.java index 1f6c7633..8d1d5158 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceSupport.java @@ -5,13 +5,13 @@ import android.content.Context; public interface DeviceSupport extends EventHandler { public void initialize(GBDevice gbDevice, BluetoothAdapter btAdapter, Context context); - + public boolean connect(); public GBDevice getDevice(); - + public BluetoothAdapter getBluetoothAdapter(); - + public Context getContext(); public void dispose(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java index 235f7e47..12c6661d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java @@ -8,7 +8,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport { @Override public void dispose() { // TODO Auto-generated method stub - + } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java index 91e4f4dd..a7718730 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java @@ -5,8 +5,6 @@ import nodomain.freeyourgadget.gadgetbridge.GBDevice; import nodomain.freeyourgadget.gadgetbridge.GBDeviceIoThread; import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol; import nodomain.freeyourgadget.gadgetbridge.protocol.PebbleProtocol; -import android.bluetooth.BluetoothAdapter; -import android.content.Context; public class PebbleSupport extends AbstractBTDeviceSupport {