X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=3e9998e5f09681b79c716aa6654cc7a9cd947b12;hb=58d2b70575f3616a056d2356a737b3be15ed3d66;hp=7b1b2aa377cdad6030e02628d883168b82f444db;hpb=d40f96fcc961cfbf6af67fc84591d2660d065ca0;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 7b1b2aa3..3e9998e5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -31,6 +31,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeech.OnInitListener;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 //import android.view.KeyEvent;
@@ -77,13 +79,15 @@ public class AltosDroid extends Activity {
 
 	private boolean mIsBound;
 	Messenger mService = null;
-	final Messenger mMessenger = new Messenger(new IncomingHandler());
+	final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
 	// Name of the connected device
 	private String mConnectedDeviceName = null;
 	// Local Bluetooth adapter
 	private BluetoothAdapter mBluetoothAdapter = null;
 
+	private TextToSpeech tts;
+	private boolean tts_enabled = false;
 
 	// The Handler that gets information back from the Telemetry Service
 	static class IncomingHandler extends Handler {
@@ -183,6 +187,14 @@ public class AltosDroid extends Activity {
 			return;
 		}
 
+		// Enable Text to Speech
+		tts = new TextToSpeech(this, new OnInitListener() {
+			public void onInit(int status) {
+				if (status == TextToSpeech.SUCCESS) tts_enabled = true;
+				if (tts_enabled) tts.speak("AltosDroid ready", TextToSpeech.QUEUE_ADD, null );
+			}
+		});
+
 		// Start Telemetry Service
 		startService(new Intent(AltosDroid.this, TelemetryService.class));
 
@@ -237,6 +249,8 @@ public class AltosDroid extends Activity {
 
 		doUnbindService();
 
+		if (tts != null) tts.shutdown();
+
 		if(D) Log.e(TAG, "--- ON DESTROY ---");
 	}
 
@@ -330,6 +344,7 @@ public class AltosDroid extends Activity {
 				Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show();
 				finish();
 			}
+			break;
 		}
 	}
 
@@ -343,13 +358,13 @@ public class AltosDroid extends Activity {
 			//Message msg = Message.obtain(null, TelemetryService.MSG_CONNECT_TELEBT);
 			//msg.obj = device;
 			//mService.send(msg);
+			if (D) Log.i(TAG, "Connecting to " + device.getName());
 			mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, device));
 		} catch (RemoteException e) {
 			e.printStackTrace();
 		}
 	}
 
-
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();