X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=1c0e94b3855ab2e7172dbb623e5272bff935c6b9;hb=54baecc208a40606e3242b2cbd5e66567053646f;hp=9059ca7950f599360910f267c867cd231448d378;hpb=5f4c47389a3d0d10d659a2e00fc74a150b5fed88;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 9059ca79..1c0e94b3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,6 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -26,7 +27,6 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-//import android.os.Binder;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
@@ -69,22 +69,25 @@ public class TelemetryService extends Service {
 	LinkedBlockingQueue<AltosLine> telem;
 
 	// Handler of incoming messages from clients.
-	class IncomingHandler extends Handler {
+	static class IncomingHandler extends Handler {
+		private final WeakReference<TelemetryService> service;
+		IncomingHandler(TelemetryService s) { service = new WeakReference<TelemetryService>(s); }
+
 		@Override
 		public void handleMessage(Message msg) {
+			TelemetryService s = service.get();
 			switch (msg.what) {
 			case MSG_REGISTER_CLIENT:
-				mClients.add(msg.replyTo);
+				s.mClients.add(msg.replyTo);
 				if (D) Log.d(TAG, "Client bound to service");
 				break;
 			case MSG_UNREGISTER_CLIENT:
-				mClients.remove(msg.replyTo);
+				s.mClients.remove(msg.replyTo);
 				if (D) Log.d(TAG, "Client unbound from service");
 				break;
 			case MSG_CONNECT_TELEBT:
 				if (D) Log.d(TAG, "Connect command received");
-				TeleBT_stop();
-				TeleBT_start((BluetoothDevice) msg.obj);
+				s.startAltosBluetooth((BluetoothDevice) msg.obj);
 				break;
 			default:
 				super.handleMessage(msg);
@@ -92,7 +95,7 @@ public class TelemetryService extends Service {
 		}
 	}
 
-	private void TeleBT_stop() {
+	private void stopAltosBluetooth() {
 		if (mAltosBluetooth != null) {
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
@@ -100,7 +103,7 @@ public class TelemetryService extends Service {
 		telem.clear();
 	}
 
-	private void TeleBT_start(BluetoothDevice d) {
+	private void startAltosBluetooth(BluetoothDevice d) {
 		mAltosBluetooth = new AltosBluetooth(d);
 		mAltosBluetooth.add_monitor(telem);
 	}
@@ -142,7 +145,7 @@ public class TelemetryService extends Service {
 	public void onDestroy() {
 
 		// Stop the bluetooth Comms threads
-		TeleBT_stop();
+		stopAltosBluetooth();
 
 		// Demote us from the foreground, and cancel the persistent notification.
 		stopForeground(true);