Add uploader service

code/SensorLogger/AndroidManifest.xml

@@ -8,8 +8,10 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
         <service android:name=".SensorLoggerService" android:label="Sensor Logger Service"/>
+        <service android:name=".UploaderService" android:label="Sensor Uploader Service"/>
     </application>
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>

code/SensorLogger/res/layout/main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">" 
@@ -8,4 +8,17 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="Hello Android from NetBeans"/>
-</LinearLayout>
+    <Button
+        android:id="@+id/start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/text"
+        android:text="Start/Stop service"/>
+    <Button
+        android:id="@+id/upload"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/text"
+        android:layout_toRightOf="@+id/start"
+        android:text="Upload data"/>
+</RelativeLayout>

code/SensorLogger/src/uk/co/md87/android/sensorlogger/MainActivity.java

@@ -6,31 +6,20 @@
 package uk.co.md87.android.sensorlogger;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.telephony.TelephonyManager;
-import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.TextView;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
 
 /**
  *
  * @author chris
  */
-public class MainActivity extends Activity {
+public class MainActivity extends Activity implements OnClickListener {
 
-    private static final String TAG = "MainActivity";
+    static final String VERSION = "0.1";
 
     /** {@inheritDoc} */
     @Override
@@ -41,25 +30,30 @@ public class MainActivity extends Activity {
 
         setContentView(R.layout.main);
 
-        int lines = 0;
+        ((Button) findViewById(R.id.start)).setOnClickListener(this);
+        ((Button) findViewById(R.id.upload)).setOnClickListener(this);
 
-        try {
-            String line;
-            BufferedReader reader =
-                new BufferedReader(new InputStreamReader(openFileInput("sensors.log")));
 
-            while ((line = reader.readLine()) != null) {
-                lines++;
+        ((TextView) findViewById(R.id.text)).setText("Welcome to sensor logger v"
+                + VERSION + "..."
+                + "\n\nThis application records any changes in your phone's "
+                + "accelerometer state to a text file, along with the timestamp "
+                + "that the change occured at.\n\n"
+                + "Hit the upload button to upload the data you've recorded so "
+                + "it can be analysed. Thanks.\n\n");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onClick(final View view) {
+        if (view.getId() == R.id.start) {
+            if (!stopService(new Intent(this, SensorLoggerService.class))) {
+                startService(new Intent(this, SensorLoggerService.class));
             }
-        } catch (FileNotFoundException ex) {
-            lines = -1;
-        } catch (IOException ex) {
-            lines = -2;
+        } else if (view.getId() == R.id.upload) {
+            stopService(new Intent(this, SensorLoggerService.class));
+            startService(new Intent(this, UploaderService.class));
         }
-
-        ((TextView) findViewById(R.id.text)).setText(
-                ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId()
-                + " -- " + getFileStreamPath("sensors.log") + " -- " + lines);
     }
 
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/R.java

@@ -11,7 +11,9 @@ public final class R {
     public static final class attr {
     }
     public static final class id {
+        public static final int start=0x7f040001;
         public static final int text=0x7f040000;
+        public static final int upload=0x7f040002;
     }
     public static final class layout {
         public static final int main=0x7f020000;

code/SensorLogger/src/uk/co/md87/android/sensorlogger/SensorLoggerService.java

@@ -13,13 +13,12 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.IBinder;
-import android.util.Log;
 import android.widget.Toast;
+
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.Arrays;
 
 /**
  *
@@ -42,7 +41,6 @@ public class SensorLoggerService extends Service {
                 writer.write(System.currentTimeMillis() + ":" +
                         event.values[0] + "," + event.values[1]
                         + "," + event.values[2] + "\n");
-                Toast.makeText(getApplicationContext(), "New values!", Toast.LENGTH_SHORT).show();
             } catch (IOException ex) {
 
             }
@@ -68,8 +66,12 @@ public class SensorLoggerService extends Service {
         try {
             stream = openFileOutput("sensors.log", MODE_APPEND | MODE_WORLD_READABLE);
             writer = new OutputStreamWriter(stream);
+            writer.write("Hello world");
+            writer.flush();
         } catch (FileNotFoundException ex) {
             return;
+        } catch (IOException ex) {
+            return;
         }
 
         manager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
@@ -78,7 +80,16 @@ public class SensorLoggerService extends Service {
             manager.registerListener(accelListener, sensor, SensorManager.SENSOR_DELAY_FASTEST);
         }
 
-        Log.i(TAG, "Registered listeners!");
+        Toast.makeText(getApplicationContext(), "Sensor logger service started",
+                Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onDestroy() {
+        manager.unregisterListener(accelListener);
+
+        Toast.makeText(getApplicationContext(), "Sensor logger service destroyed",
+                Toast.LENGTH_SHORT).show();
     }
 
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/UploaderService.java

@@ -0,0 +1,66 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.android.sensorlogger;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.FileEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.HttpParams;
+
+/**
+ *
+ * @author chris
+ */
+public class UploaderService extends Service {
+
+    @Override
+    public void onStart(Intent intent, int startId) {
+        super.onStart(intent, startId);
+
+        final HttpPost post = new HttpPost("http://chris.smith.name/android/upload");
+        final File file = getFileStreamPath("sensors.log");
+        final FileEntity entity = new FileEntity(file, "text/plain");
+
+        post.setEntity(entity);
+        post.addHeader("x-application", "SensorLogger");
+        post.addHeader("x-version", MainActivity.VERSION);
+        post.addHeader("x-imei", ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId());
+
+        try {
+            int code = new DefaultHttpClient().execute(post).getStatusLine().getStatusCode();
+
+            Toast.makeText(getApplicationContext(), "Upload complete (" + code + ")",
+                Toast.LENGTH_SHORT).show();
+
+            file.delete();
+        } catch (IOException ex) {
+            Log.e("UploaderService", "Unable to upload sensor logs", ex);
+
+            Toast.makeText(getApplicationContext(), "Upload failed",
+                Toast.LENGTH_SHORT).show();
+        }
+
+        startService(new Intent(this, SensorLoggerService.class));
+        stopSelf();
+    }
+
+    @Override
+    public IBinder onBind(Intent arg0) {
+        return null;
+    }
+
+}