altosdroid: remove old Binder from TelemetryService

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryService.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index a4e85ad07294c1b2687d828da66e59ade1b6a17a..15293b9e8ed5a55fd1e0a8453b04ff8968413447 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -22,42 +22,42 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;
-import android.os.Binder;
+//import android.os.Binder;
 import android.os.IBinder;
 import android.util.Log;
 import android.widget.Toast;
 
 // Need the following import to get access to the app resources, since this
 // class is in a sub-package.
-import org.altusmetrum.AltosDroid.R;
-
+//import org.altusmetrum.AltosDroid.R;
 
+import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
-    /**
-     * Class for clients to access.  Because we know this service always
-     * runs in the same process as its clients, we don't need to deal with
-     * IPC.
-     */
-    public class TelemetryBinder extends Binder {
-        TelemetryService getService() {
-            return TelemetryService.this;
-        }
-    }
+       private static final String TAG = "TelemetryService";
+       private static final boolean D = true;
+
        // Unique Identification Number for the Notification.
        // We use it on Notification start, and to cancel it.
        private int NOTIFICATION = R.string.telemetry_service_label;
        private NotificationManager mNM;
 
+
+       // Name of the connected device
+       private String mConnectedDeviceName = null;
+       private AltosBluetooth mAltosBluetooth = null;
+
+       LinkedBlockingQueue<AltosLine> telem;
+
        @Override
-    public void onCreate() {
+       public void onCreate() {
                // Create a reference to the NotificationManager so that we can update our notifcation text later
                mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
        }
 
        @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
+       public int onStartCommand(Intent intent, int flags, int startId) {
                Log.i("TelemetryService", "Received start id " + startId + ": " + intent);
 
                CharSequence text = getText(R.string.telemetry_service_started);
@@ -67,7 +67,7 @@ public class TelemetryService extends Service {
 
                // The PendingIntent to launch our activity if the user selects this notification
                PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-                new Intent(this, TelemetryServiceActivities.Controller.class), 0);
+                               new Intent(this, AltosDroid.class), 0);
 
                // Set the info for the views that show in the notification panel.
                notification.setLatestEventInfo(this, getText(R.string.telemetry_service_label), text, contentIntent);
@@ -84,7 +84,7 @@ public class TelemetryService extends Service {
        }
 
        @Override
-    public void onDestroy() {
+       public void onDestroy() {
 
 
                // Demote us from the foreground, and cancel the persistent notification.
@@ -95,12 +95,8 @@ public class TelemetryService extends Service {
        }
 
        @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
+       public IBinder onBind(Intent intent) {
        }
 
-    // This is the object that receives interactions from clients.  See
-    // RemoteService for a more complete example.
-    private final IBinder mBinder = new TelemetryBinder();
 
 }