From: Keith Packard <keithp@keithp.com>
Date: Tue, 17 Feb 2015 05:32:54 +0000 (-0800)
Subject: altosdroid: Only speak when GUI is running
X-Git-Tag: 1.6.0.3~122^2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8f2d82461f3cf5da157b23ea45a2fa60d56b196b;ds=sidebyside

altosdroid: Only speak when GUI is running

Create voice in onStart, stop it in onStop. This way, if some other
application is in use, the voice won't be annoying you.

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 273688d8..41045f03 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -352,7 +352,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		for (AltosDroidTab mTab : mTabs)
 			mTab.update_ui(state, from_receiver, location, mTab == mTabsAdapter.currentItem());
 
-		if (state != null)
+		if (state != null && mAltosVoice != null)
 			mAltosVoice.tell(state, from_receiver);
 
 		saved_state = state;
@@ -465,8 +465,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		mStateLayout   = (RelativeLayout) findViewById(R.id.state_container);
 		mStateView     = (TextView) findViewById(R.id.state_value);
 		mAgeView       = (TextView) findViewById(R.id.age_value);
-
-		mAltosVoice = new AltosVoice(this);
 	}
 
 	@Override
@@ -484,6 +482,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 		doBindService();
 
+		if (mAltosVoice == null)
+			mAltosVoice = new AltosVoice(this);
 	}
 
 	@Override
@@ -504,6 +504,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		if(D) Log.e(TAG, "-- ON STOP --");
 
 		doUnbindService();
+		if (mAltosVoice != null) {
+			mAltosVoice.stop();
+			mAltosVoice = null;
+		}
 	}
 
 	@Override