o Supporting re-activation of the MainActivity. Must initialize the local data with the device list if it is already in the 'ready' state.

1 files changed, 10 insertions, 2 deletions

diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
index 984016a..017d207 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
@@ -83,6 +83,14 @@ public class MainActivity extends ListActivity {
                 Log.i(TAG, "onServiceConnected");
                 soilMoistureService = ((LocalBinder<SoilMoistureService>) service).getService();
                 registerReceiver(serviceListener, SoilMoistureListener.INTENT_FILTER);
+
+                if (soilMoistureService.isReady()) {
+                    serviceListener.onReady(true);
+
+                    for (SmDevice smDevice : soilMoistureService.getDevices()) {
+                        serviceListener.onNewDevice(smDevice.getBtDevice().getAddress());
+                    }
+                }
             }
 
             @Override
@@ -646,7 +654,8 @@ public class MainActivity extends ListActivity {
 
         @Override
         public void onReady(boolean ok) {
-            if (!ok) {
+            ready = ok;
+            if (!ready) {
                 Toast.makeText(context,
                         "Could not initialize services.",
                         Toast.LENGTH_SHORT).
@@ -654,7 +663,6 @@ public class MainActivity extends ListActivity {
 
                 finish();
             } else {
-                ready = true;
                 deviceList = new DeviceListAdapter();
                 setListAdapter(deviceList);