From 3e619a735e63a1222e71060d9e65b354a156b158 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 28 Jan 2015 23:45:38 +0100
Subject: o Major refactoring on  the BtPromise, mainly internal. Renaming
 BtPromise to BtSequence and BtSequencer.

---
 .../soilmoisture/DefaultSoilMoistureService.java   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java')

diff --git a/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java b/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java
index 3e1c93b..2cf85d9 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java
@@ -26,15 +26,16 @@ import java.util.TreeSet;
 import io.trygvis.android.Function;
 import io.trygvis.android.LocalBinder;
 import io.trygvis.android.bt.BtDevice;
-import io.trygvis.android.bt.BtPromise;
+import io.trygvis.android.bt.BtSequence;
 import io.trygvis.android.bt.BtService;
 import io.trygvis.android.bt.DefaultBtService;
 import io.trygvis.bluetooth.TrygvisIoUuids;
 
-import static io.trygvis.android.bt.BtPromise.PromiseResult.continueDirectly;
-import static io.trygvis.android.bt.BtPromise.PromiseResult.detour;
-import static io.trygvis.android.bt.BtPromise.PromiseResult.stop;
-import static io.trygvis.android.bt.BtPromise.PromiseResult.waitForNextEvent;
+import static io.trygvis.android.bt.BtSequence.SequenceResult;
+import static io.trygvis.android.bt.BtSequence.SequenceResult.continueDirectly;
+import static io.trygvis.android.bt.BtSequence.SequenceResult.detour;
+import static io.trygvis.android.bt.BtSequence.SequenceResult.stop;
+import static io.trygvis.android.bt.BtSequence.SequenceResult.waitForNextEvent;
 import static io.trygvis.android.bt.BtService.BtServiceListenerBroadcastReceiver;
 import static io.trygvis.bluetooth.TrygvisIoUuids.CLIENT_CHARACTERISTIC_CONFIG;
 import static io.trygvis.soilmoisture.SmDevice.GetSensorCountRes;
@@ -139,8 +140,8 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
         }
     };
 
-    private BtPromise readAttribute(String value, byte[] req, Function<byte[], BtPromise.PromiseResult> handler) {
-        return new BtPromise().
+    private BtSequence readAttribute(String value, byte[] req, Function<byte[], SequenceResult> handler) {
+        return new BtSequence().
                 onDirect(gatt -> {
                     Log.i(TAG, "Getting attribute: " + value);
 
@@ -158,7 +159,7 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
                 });
     }
 
-    private BtPromise readSensorName(SmDevice device, int index) {
+    private BtSequence readSensorName(SmDevice device, int index) {
         byte[] req = createGetSensorNameReq((byte) index);
 
         return readAttribute("sensor name, index#" + index, req, bytes -> {
@@ -179,7 +180,7 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
         SmDevice smDevice = btDevice.getTag();
 
         Log.i(TAG, "Probing " + address + ", name=" + btDevice.getName());
-        BtPromise promise = new BtPromise().
+        BtSequence sequence = new BtSequence().
                 onDirect(gatt -> {
                     BluetoothGattService service = gatt.getService(TrygvisIoUuids.Services.SOIL_MOISTURE_SERVICE);
 
@@ -210,7 +211,7 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
                     }
                 });
 
-        BtPromise btPromise = readAttribute("sensor count", createGetSensorCountReq(), bytes -> {
+        BtSequence btSequence = readAttribute("sensor count", createGetSensorCountReq(), bytes -> {
             GetSensorCountRes getSensorCountRes = parseResponse(bytes, GET_SENSOR_COUNT, GetSensorCountRes.class);
 
             int count = getSensorCountRes.count;
@@ -221,9 +222,8 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
 
             return detour(readSensorName(smDevice, 0));
         });
-        promise.andThen(btPromise);
 
-        btDevice.withConnection(promise);
+        btDevice.withConnection(sequence.andThen(btSequence));
     }
 
     private void markDeviceAsNotUseful(SmDevice device) {
@@ -371,7 +371,7 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
     }
 
     void readCurrentValue(SmSensor sensor) {
-        BtPromise promise = new BtPromise().
+        BtSequence sequence = new BtSequence().
                 onDirect(gatt -> {
                     BluetoothGattService service = gatt.getService(TrygvisIoUuids.Services.SOIL_MOISTURE_SERVICE);
                     BluetoothGattCharacteristic soilMoisture = service.getCharacteristic(TrygvisIoUuids.Characteristics.SOIL_MOISTURE);
@@ -402,7 +402,7 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
                     }
                 });
 
-        sensor.getDevice().getBtDevice().withConnection(promise);
+        sensor.getDevice().getBtDevice().withConnection(sequence);
     }
 
     // -----------------------------------------------------------------------
-- 
cgit v1.2.3