altosdroid: Make sure whole flight state is spoken even when no-one is moving

This eliminates the case where much of the flight state wasn't
reported if the tracker or receiver weren't moving.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 9e953ffe7fc967a779704a73b800ad9218969785..8eb08b99dbb62dc08f1d8cebd025b5900bad67d7 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -195,8 +195,8 @@ public class AltosVoice {
                        return true;
                }
 
                        return true;
                }
 

-               if (last_tell_mode == TELL_MODE_FLIGHT) {
-                       if (time_since_speak() < 10 * 1000 && last_flight_tell == TELL_FLIGHT_TRACK)
+               if (last_tell_mode == TELL_MODE_FLIGHT && last_flight_tell == TELL_FLIGHT_TRACK) {
+                       if (time_since_speak() < 10 * 1000)

                                return false;
                        if (!target_moved(state) && !receiver_moved(receiver))
                                return false;
                                return false;
                        if (!target_moved(state) && !receiver_moved(receiver))
                                return false;