Merge remote-tracking branch 'mjb/altosdroid'

1 files changed, 8 insertions, 0 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 393fd2f6..3cb498e8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -76,6 +76,7 @@ public class TelemetryService extends Service {
 	private AltosBluetooth  mAltosBluetooth  = null;
 	private AltosConfigData mConfigData      = null;
 	private TelemetryReader mTelemetryReader = null;
+	private TelemetryLogger mTelemetryLogger = null;
 
 	// internally track state of bluetooth connection
 	private int state = STATE_NONE;
@@ -164,6 +165,11 @@ public class TelemetryService extends Service {
 			}
 			mTelemetryReader = null;
 		}
+		if (mTelemetryLogger != null) {
+			if (D) Log.d(TAG, "stopAltosBluetooth(): stopping TelemetryLogger");
+			mTelemetryLogger.stop();
+			mTelemetryLogger = null;
+		}
 		if (mAltosBluetooth != null) {
 			if (D) Log.d(TAG, "stopAltosBluetooth(): stopping AltosBluetooth");
 			mAltosBluetooth.close();
@@ -216,6 +222,8 @@ public class TelemetryService extends Service {
 
 		mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
 		mTelemetryReader.start();
+		
+		mTelemetryLogger = new TelemetryLogger(this, mAltosBluetooth);
 	}