From fce66be9d662d6d98d23191a3c623cae549a29b2 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 29 Jun 2015 23:41:53 +0200
Subject: o Supporting re-activation of the MainActivity. Must initialize the
 local data with the device list if it is already in the 'ready' state.

---
 .../soilmoisture/DefaultSoilMoistureService.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 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 8f748a8..0becb24 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/DefaultSoilMoistureService.java
@@ -63,6 +63,8 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
 
     private BtService<SmDevice> btService;
 
+    private boolean ready;
+
     @Override
     public IBinder onBind(Intent intent) {
         return binder;
@@ -76,10 +78,12 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
             @SuppressWarnings("unchecked")
             @Override
             public void onServiceConnected(ComponentName componentName, IBinder service) {
+                Log.i(TAG, "onServiceConnected, componentName=" + componentName.toShortString() + ", binder=" + service.toString());
+
                 btService = ((LocalBinder<BtService<SmDevice>>) service).getService();
-                boolean ok = btService.initialize(DefaultSoilMoistureService.this::createTag);
+                ready = btService.initialize(DefaultSoilMoistureService.this::createTag);
 
-                sendBroadcast(createReady(ok));
+                sendBroadcast(createReady(ready));
             }
 
             @Override
@@ -279,6 +283,11 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
     // SmDevicesManager Implementation
     // -----------------------------------------------------------------------
 
+    @Override
+    public List<SmDevice> getDevices() {
+        return getDevices(SmDevice.addressComparator);
+    }
+
     @Override
     public List<SmDevice> getDevices(Comparator<SmDevice> comparator) {
         Set<SmDevice> devices = new TreeSet<>(comparator);
@@ -293,6 +302,11 @@ public class DefaultSoilMoistureService extends Service implements SoilMoistureS
         return btService.getTag(address);
     }
 
+    @Override
+    public boolean isReady() {
+        return ready;
+    }
+
     @Override
     public boolean isScanning() {
         return btService.isScanning();
-- 
cgit v1.2.3