diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-04 21:04:18 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-04 21:04:18 +0100 |
commit | 31fc64bec1c5286c27bdc1f683d037ae0e91418d (patch) | |
tree | cfc74e502e5499422f0cd11a1716bcb07977887a /app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | |
parent | 1b9a4defe73f3aa8c10aa4af49002f0cebd1c292 (diff) | |
download | io.trygvis.soilmoisture-android-31fc64bec1c5286c27bdc1f683d037ae0e91418d.tar.gz io.trygvis.soilmoisture-android-31fc64bec1c5286c27bdc1f683d037ae0e91418d.tar.bz2 io.trygvis.soilmoisture-android-31fc64bec1c5286c27bdc1f683d037ae0e91418d.tar.xz io.trygvis.soilmoisture-android-31fc64bec1c5286c27bdc1f683d037ae0e91418d.zip |
o Adding a method to run a transaction in the BtService's database.
Diffstat (limited to 'app/src/main/java/io/trygvis/soilmoisture/MainActivity.java')
-rw-r--r-- | app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java index 64e8202..2e6df76 100644 --- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java +++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java @@ -252,9 +252,9 @@ public class MainActivity extends ListActivity { for (SmDevice d : devices) { (d.isUseful() ? usefulDevices : unusefulDevices).add(d); } - List<SoilMonitor> monitors = new ArrayList<>(); + List<SmSensor> monitors = new ArrayList<>(); for (SmDevice d : devices) { - monitors.addAll(d.getMonitors()); + monitors.addAll(d.getSensors()); } if (groupByDevice) { @@ -333,7 +333,7 @@ public class MainActivity extends ListActivity { if (o instanceof SmDevice) { return 0; - } else if (o instanceof SoilMonitor) { + } else if (o instanceof SmSensor) { return 1; } @@ -371,8 +371,8 @@ public class MainActivity extends ListActivity { if (o instanceof SmDevice) { return getSmDeviceView((SmDevice) o, view); - } else if (o instanceof SoilMonitor) { - return getSoilMonitorView((SoilMonitor) o, view); + } else if (o instanceof SmSensor) { + return getSoilMonitorView((SmSensor) o, view); } throw new RuntimeException("Not implemented"); @@ -408,7 +408,7 @@ public class MainActivity extends ListActivity { return view; } - private View getSoilMonitorView(SoilMonitor soilMonitor, View view) { + private View getSoilMonitorView(SmSensor smSensor, View view) { throw new RuntimeException("Not implemented"); } } |