Functioning activity recorder

Refactored ExceptionHandler to be general purpose

code/ActivityRecorder/AndroidManifest.xml

@@ -13,6 +13,7 @@
         <service android:name=".ClassifierService" android:label="Activity Classification Service"/>
     </application>
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-sdk android:minSdkVersion="3" />
 </manifest>

code/ActivityRecorder/res/layout/item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp"
+    android:textSize="16sp" >
+</TextView>

code/ActivityRecorder/res/layout/main.xml

@@ -11,10 +11,11 @@
         android:layout_marginTop="5dip"
         android:layout_marginBottom="5dip"
         />
-    <TextView
+     <ListView
+        android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"
-        android:layout_gravity="fill"
-        android:text="Hello Android from NetBeans"/>
+        android:drawSelectorOnTop="false"
+        />
 </LinearLayout>

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/ActivityRecorderActivity.java

@@ -7,11 +7,24 @@ package uk.co.md87.android.activityrecorder;
 
 import android.app.Activity;
 import android.content.ComponentName;
+import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.RemoteException;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
 import android.widget.Toast;
+import java.util.Map;
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
+import uk.co.md87.android.common.ExceptionHandler;
 
 /**
  *
@@ -21,10 +34,14 @@ public class ActivityRecorderActivity extends Activity {
 
     ActivityRecorderBinder service = null;
 
-    private ServiceConnection connection = new ServiceConnection() {
+    final Handler handler = new Handler();
+
+    private final ServiceConnection connection = new ServiceConnection() {
 
         public void onServiceConnected(ComponentName arg0, IBinder arg1) {
             service = ActivityRecorderBinder.Stub.asInterface(arg1);
+
+            handler.postDelayed(updateRunnable, 500);
         }
 
         public void onServiceDisconnected(ComponentName arg0) {
@@ -33,12 +50,90 @@ public class ActivityRecorderActivity extends Activity {
         }
     };
 
+    private final Runnable updateRunnable = new Runnable() {
+
+        public void run() {
+            updateButton();
+            
+            handler.postDelayed(updateRunnable, 500);
+        }
+    };
+
+    private OnClickListener clickListener = new OnClickListener() {
+
+        public void onClick(View arg0) {
+            try {
+                if (service.isRunning()) {
+                    stopService(new Intent(ActivityRecorderActivity.this,
+                            RecorderService.class));
+                } else {
+                    startService(new Intent(ActivityRecorderActivity.this,
+                            RecorderService.class));
+                }
+
+                updateButton();
+            } catch (RemoteException ex) {
+                Log.e(getClass().getName(), "Unable to get service state", ex);
+            }
+        }
+    };
+
     /** {@inheritDoc} */
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        Thread.setDefaultUncaughtExceptionHandler(
+                new ExceptionHandler("ActivityRecorder",
+                "http://chris.smith.name/android/upload", getVersionName(), getIMEI()));
+
+        bindService(new Intent(this, RecorderService.class), connection, BIND_AUTO_CREATE);
+
         setContentView(R.layout.main);
+        ((Button) findViewById(R.id.togglebutton)).setEnabled(false);
+        ((Button) findViewById(R.id.togglebutton)).setOnClickListener(clickListener);
+        ((ListView) findViewById(R.id.list)).setAdapter(
+                new ArrayAdapter<Map.Entry<Long, String>>(this, R.layout.item));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        unbindService(connection);
+    }
+
+    @SuppressWarnings("unchecked")
+    void updateButton() {
+        try {
+            ((Button) findViewById(R.id.togglebutton)).setText(service.isRunning()
+                    ? R.string.service_enabled : R.string.service_disabled);
+            ((Button) findViewById(R.id.togglebutton)).setEnabled(true);
+            
+            // Hacky
+            ((ArrayAdapter<Map.Entry<Long, String>>) ((ListView) findViewById(R.id.list))
+                    .getAdapter()).clear();
+            for (Map.Entry<Long, String> entry : ((Map<Long, String>) service
+                    .getClassifications()).entrySet()) {
+                ((ArrayAdapter<Map.Entry<Long, String>>) ((ListView) findViewById(R.id.list))
+                    .getAdapter()).add(entry);
+            }
+        } catch (RemoteException ex) {
+            Log.e(getClass().getName(), "Unable to get service state", ex);
+        }
+    }
+
+    public String getVersionName() {
+        try {
+            return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+        } catch (NameNotFoundException ex) {
+            return "Unknown";
+        }
+    }
+
+    public String getIMEI() {
+        return ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)).getDeviceId();
     }
 
 }

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/ClassifierService.java

@@ -11,6 +11,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.util.Log;
 import android.widget.Toast;
 
 import java.util.Map;
@@ -50,7 +51,18 @@ public class ClassifierService extends Service implements Runnable {
     public void onStart(Intent intent, int startId) {
         super.onStart(intent, startId);
 
+        Log.i(getClass().getName(), "Starting classifier");
+
         data = intent.getFloatArrayExtra("data");
+
+        new Thread(this).start();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        unbindService(connection);
     }
 
     @Override
@@ -99,7 +111,9 @@ public class ClassifierService extends Service implements Runnable {
 
         classification = bestActivity;
 
-        bindService(new Intent(this, ActivityRecorderActivity.class), connection, BIND_AUTO_CREATE);
+        Log.i(getClass().getName(), "Classification: " + classification);
+
+        bindService(new Intent(this, RecorderService.class), connection, BIND_AUTO_CREATE);
     }
 
 }

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/R.java

@@ -14,10 +14,12 @@ public final class R {
         public static final int icon=0x7f020000;
     }
     public static final class id {
+        public static final int list=0x7f060001;
         public static final int togglebutton=0x7f060000;
     }
     public static final class layout {
-        public static final int main=0x7f030000;
+        public static final int item=0x7f030000;
+        public static final int main=0x7f030001;
     }
     public static final class raw {
         public static final int basic_model=0x7f040000;

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/RecorderService.java

@@ -34,6 +34,7 @@ public class RecorderService extends Service {
     private final ActivityRecorderBinder.Stub binder = new ActivityRecorderBinder.Stub() {
 
         public void submitClassification(String classification) throws RemoteException {
+            Log.i(getClass().getName(), "Adding classification: " + classification);
             classifications.put(System.currentTimeMillis(), classification);
         }
 
@@ -100,6 +101,7 @@ public class RecorderService extends Service {
     }
 
     public void sample() {
+        Log.i(getClass().getName(), "Sampling");
         data[(nextSample * 2) % 256] = values[0];
         data[(nextSample * 2 + 1) % 256] = values[1];
         
@@ -118,6 +120,7 @@ public class RecorderService extends Service {
     }
 
     public void analyse(float[] data) {
+        Log.i(getClass().getName(), "Analysing");
         final Intent intent = new Intent(this, ClassifierService.class);
         intent.putExtra("data", data);
         startService(intent);
@@ -160,6 +163,7 @@ public class RecorderService extends Service {
     }
 
     void register() {
+        Log.i(getClass().getName(), "Registering");
         nextSample = 0;
         manager.registerListener(accelListener,
                 manager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),

code/ActivityRecorder/src/uk/co/md87/android/common/ExceptionHandler.java

@@ -0,0 +1,77 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.android.common;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.protocol.HTTP;
+
+/**
+ *
+ * @author chris
+ */
+public class ExceptionHandler implements UncaughtExceptionHandler {
+
+    private UncaughtExceptionHandler defaultUEH;
+
+    private String appname, url, version, imei;
+
+    /*
+     * if any of the parameters is null, the respective functionality
+     * will not be used
+     */
+    public ExceptionHandler(String appname, String url, String version, String imei) {
+        this.appname = appname;
+        this.url = url;
+        this.version = version;
+        this.imei = imei;
+        this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+    }
+
+    public void uncaughtException(Thread t, Throwable e) {
+        String timestamp = String.valueOf(System.currentTimeMillis());
+        final Writer result = new StringWriter();
+        final PrintWriter printWriter = new PrintWriter(result);
+        e.printStackTrace(printWriter);
+        String stacktrace = result.toString();
+        printWriter.close();
+        String filename = timestamp + ".stacktrace";
+
+        sendToServer(stacktrace, filename);
+
+        defaultUEH.uncaughtException(t, e);
+    }
+
+    private void sendToServer(String stacktrace, String filename) {
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        HttpPost httpPost = new HttpPost(url);
+
+        httpPost.setHeader("x-application", appname + "-exception");
+        httpPost.setHeader("x-version", version);
+        httpPost.setHeader("x-imei", imei);
+
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("filename", filename));
+        nvps.add(new BasicNameValuePair("stacktrace", stacktrace));
+        try {
+            httpPost.setEntity(
+                    new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
+            httpClient.execute(httpPost);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

code/SensorLogger/AndroidManifest.xml

@@ -23,7 +23,6 @@
             android:label="Sensor Logger > Thanks"/>
 
         <service android:name=".SensorLoggerService" android:label="Sensor Logger Service"/>
-
         <service android:name=".RecorderService" android:label="Sensor Logger Service"/>
         <service android:name=".ClassifierService" android:label="Sensor Classifier Service"/>
         <service android:name=".UploaderService" android:label="Sensor Uploader Service"/>

code/SensorLogger/src/uk/co/md87/android/sensorlogger/ExceptionHandler.java → code/SensorLogger/src/uk/co/md87/android/common/ExceptionHandler.java

@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package uk.co.md87.android.sensorlogger;
+package uk.co.md87.android.common;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -27,13 +27,14 @@ public class ExceptionHandler implements UncaughtExceptionHandler {
 
     private UncaughtExceptionHandler defaultUEH;
 
-    private String url, version, imei;
+    private String appname, url, version, imei;
 
     /*
      * if any of the parameters is null, the respective functionality
      * will not be used
      */
-    public ExceptionHandler(String url, String version, String imei) {
+    public ExceptionHandler(String appname, String url, String version, String imei) {
+        this.appname = appname;
         this.url = url;
         this.version = version;
         this.imei = imei;
@@ -58,7 +59,7 @@ public class ExceptionHandler implements UncaughtExceptionHandler {
         DefaultHttpClient httpClient = new DefaultHttpClient();
         HttpPost httpPost = new HttpPost(url);
 
-        httpPost.setHeader("x-application", "SensorLogger-exception");
+        httpPost.setHeader("x-application", appname + "-exception");
         httpPost.setHeader("x-version", version);
         httpPost.setHeader("x-imei", imei);
 

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/IntroActivity.java

@@ -14,7 +14,7 @@ import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import uk.co.md87.android.sensorlogger.ExceptionHandler;
+import uk.co.md87.android.common.ExceptionHandler;
 
 import uk.co.md87.android.sensorlogger.R;
 
@@ -30,8 +30,8 @@ public class IntroActivity extends BoundActivity implements OnClickListener {
         super.onCreate(icicle);
 
         Thread.setDefaultUncaughtExceptionHandler(
-                new ExceptionHandler("http://chris.smith.name/android/upload",
-                getVersionName(), getIMEI()));
+                new ExceptionHandler("SensorLogger",
+                "http://chris.smith.name/android/upload", getVersionName(), getIMEI()));
 
         setContentView(R.layout.intro);