From 991620666551c1eaf655a0aa0b1fe08d2bc19681 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Fri, 30 Jan 2015 18:54:26 +0100
Subject: o This variant actually work on a device.

---
 app/src/main/java/io/trygvis/android/bt/BtDevice.java         | 4 ++--
 app/src/main/java/io/trygvis/android/bt/DefaultBtService.java | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/io/trygvis/android/bt/BtDevice.java b/app/src/main/java/io/trygvis/android/bt/BtDevice.java
index 07e4e52..50fe707 100644
--- a/app/src/main/java/io/trygvis/android/bt/BtDevice.java
+++ b/app/src/main/java/io/trygvis/android/bt/BtDevice.java
@@ -107,7 +107,7 @@ public class BtDevice<A> implements Comparable<BtDevice> {
             throw new RuntimeException("The current callback is not done.");
         }
 
-        Log.i(TAG, "withConnection(), address=" + address + ", connected: " + (gatt != null));
+        Log.i(TAG, "withConnection(), address=" + address + ", connected: " + connected());
 
         BtSequence newSequence;
         if (gatt == null) {
@@ -154,7 +154,7 @@ public class BtDevice<A> implements Comparable<BtDevice> {
         if (gatt == null) {
             gatt = bluetoothDevice.connectGatt(btService, false, wrappingCallback);
         } else {
-            sequencer.onDirect();
+            sequencer.onDirect(gatt);
         }
     }
 
diff --git a/app/src/main/java/io/trygvis/android/bt/DefaultBtService.java b/app/src/main/java/io/trygvis/android/bt/DefaultBtService.java
index 2487bd8..fc1819c 100644
--- a/app/src/main/java/io/trygvis/android/bt/DefaultBtService.java
+++ b/app/src/main/java/io/trygvis/android/bt/DefaultBtService.java
@@ -57,6 +57,13 @@ public class DefaultBtService<A> extends Service implements BtService<A> {
 
     private Scanner scanner = new Scanner();
 
+    static {
+        BtSequencer.d = msg -> Log.d(BtSequencer.TAG, msg);
+        BtSequencer.i = msg -> Log.i(BtSequencer.TAG, msg);
+        BtSequencer.w = msg -> Log.w(BtSequencer.TAG, msg);
+        BtSequencer.we = pair -> Log.w(BtSequencer.TAG, pair.getKey(), pair.getValue());
+    }
+
     // -----------------------------------------------------------------------
     // BtService Implementation
     // -----------------------------------------------------------------------
-- 
cgit v1.2.3