X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=f06ed213984a2413e65febb35ab96f93a1ff3b10;hp=bc3371f3cfee607dc16f495cc2565976bee0d93b;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=c5b31a14e1ceeb9a33e0016f345832344d24ced7

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index bc3371f3..f06ed213 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -36,36 +36,18 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
 import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationListener;
+import android.location.Criteria;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_5.*;
 
-class AltosLocationListener implements LocationListener {
-	Handler handler;
 
-	public void onLocationChanged(Location location) {
-		handler.obtainMessage(TelemetryService.MSG_LOCATION, location).sendToTarget();
-	}
-
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-	}
-
-	public void onProviderEnabled(String provider) {
-	}
-
-	public void onProviderDisabled(String provider) {
-	}
-
-	public AltosLocationListener(Handler handler) {
-		this.handler = handler;
-	}
-}
-
-public class TelemetryService extends Service {
+public class TelemetryService extends Service implements LocationListener {
 
 	private static final String TAG = "TelemetryService";
 	private static final boolean D = true;
@@ -78,8 +60,7 @@ public class TelemetryService extends Service {
 	static final int MSG_DISCONNECTED      = 6;
 	static final int MSG_TELEMETRY         = 7;
 	static final int MSG_SETFREQUENCY      = 8;
-	static final int MSG_LOCATION	       = 9;
-	static final int MSG_CRC_ERROR	       = 10;
+	static final int MSG_CRC_ERROR	       = 9;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -108,10 +89,6 @@ public class TelemetryService extends Service {
 	// internally track state of bluetooth connection
 	private int state = STATE_NONE;
 
-	// location listeners
-
-	private AltosLocationListener locationListener;
-	
 	// Last data seen; send to UI when it starts
 
 	private AltosState last_state;
@@ -171,11 +148,6 @@ public class TelemetryService extends Service {
 				s.last_state = (AltosState) msg.obj;
 				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
 				break;
-			case MSG_LOCATION:
-				// forward location messages
-				s.last_location = (Location) msg.obj;
-				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_LOCATION, msg.obj));
-				break;
 			case MSG_CRC_ERROR:
 				// forward crc error messages
 				s.last_crc_errors = (Integer) msg.obj;
@@ -308,12 +280,10 @@ public class TelemetryService extends Service {
 		timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 10000L, 10000L);
 
 		// Listen for GPS and Network position updates
-		locationListener = new AltosLocationListener(mHandler);
-
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
 		
-		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
-		locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListener);
+		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 1, this);
+//		locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
 	}
 
 	@Override
@@ -347,8 +317,7 @@ public class TelemetryService extends Service {
 	public void onDestroy() {
 
 		// Stop listening for location updates
-		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
-		locationManager.removeUpdates(locationListener);
+		((LocationManager) getSystemService(Context.LOCATION_SERVICE)).removeUpdates(this);
 
 		// Stop the bluetooth Comms threads
 		stopAltosBluetooth();
@@ -369,4 +338,18 @@ public class TelemetryService extends Service {
 	}
 
 
+	public void onLocationChanged(Location location) {
+		last_location = location;
+		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_LOCATION, location));
+	}
+
+	public void onStatusChanged(String provider, int status, Bundle extras) {
+	}
+
+	public void onProviderEnabled(String provider) {
+	}
+
+	public void onProviderDisabled(String provider) {
+	}
+
 }