From: Nathaniel Wesley Filardo Date: Sat, 20 Aug 2016 19:17:37 +0000 (-0400) Subject: Small tidying X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=e917841ec2f72ad090d2261ad1f54b0b1077f374;p=acmetensortoys-teled Small tidying --- diff --git a/mobile/src/main/java/com/acmetensortoys/android/teled/Service/TeleDService.java b/mobile/src/main/java/com/acmetensortoys/android/teled/Service/TeleDService.java index 6a25be7..a63b454 100644 --- a/mobile/src/main/java/com/acmetensortoys/android/teled/Service/TeleDService.java +++ b/mobile/src/main/java/com/acmetensortoys/android/teled/Service/TeleDService.java @@ -33,7 +33,7 @@ import ioio.lib.util.android.IOIOAndroidApplicationHelper; */ public class TeleDService extends Service { // Manage a collection of behaviors - private final BehaviorHandleSet> bhs = new BehaviorHandleSet(); + private final BehaviorHandleSet> bhs = new BehaviorHandleSet<>(); // Some behaviors pause and unpause on SMS preference or GPS preference (or both!) private final BehaviorHandleSet> smsbhs = new BehaviorHandleSet<>(); diff --git a/mobile/src/main/java/com/acmetensortoys/android/teled/Utils/Android/PendingIntentBH.java b/mobile/src/main/java/com/acmetensortoys/android/teled/Utils/Android/PendingIntentBH.java index fda15d9..58c47da 100644 --- a/mobile/src/main/java/com/acmetensortoys/android/teled/Utils/Android/PendingIntentBH.java +++ b/mobile/src/main/java/com/acmetensortoys/android/teled/Utils/Android/PendingIntentBH.java @@ -51,7 +51,7 @@ public abstract class PendingIntentBH extends SuspendableBH { @Override public void suspend() { BehaviorState bs = ln.getLast(); - switch(ln.getLast()) { + switch(bs) { case RUNNING: this.onPause(pi); // fallthru