Bug fix relating to turning display off

code/SensorLogger/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="uk.co.md87.android.sensorlogger" android:versionCode="13" android:versionName="0.2.0">
+     package="uk.co.md87.android.sensorlogger" android:versionCode="14" android:versionName="0.2.1">
     <application android:label="Sensor Logger" android:icon="@drawable/icon">
         <activity android:name=".activities.IntroActivity" android:label="Sensor Logger">
             <intent-filter>

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

@@ -33,23 +33,7 @@ public class SensorLoggerService extends Service {
     private final SensorLoggerBinder.Stub binder = new SensorLoggerBinder.Stub() {
 
         public void setState(int newState) throws RemoteException {
-            switch (newState) {
-                case 1:
-                    countdown = 10;
-
-                    handler.removeCallbacks(countdownTask);
-                    handler.postDelayed(countdownTask, 1000);
-                    break;
-                case 3:
-                    startService(new Intent(SensorLoggerService.this, RecorderService.class));
-                    break;
-                case 8:
-                    ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).cancel(0);
-                    stopSelf();
-                    break;
-            }
-
-            state = newState;
+            doSetState(newState);
         }
 
         public int getCountdownTime() throws RemoteException {
@@ -113,6 +97,8 @@ public class SensorLoggerService extends Service {
         public void run() {
             if (--countdown > 0) {
                 handler.postDelayed(countdownTask, 1000);
+            } else {
+                doSetState(3);
             }
         }
     };
@@ -164,4 +150,24 @@ public class SensorLoggerService extends Service {
         return binder;
     }
 
+    void doSetState(final int newState) {
+        switch (newState) {
+            case 1:
+                countdown = 10;
+
+                handler.removeCallbacks(countdownTask);
+                handler.postDelayed(countdownTask, 1000);
+                break;
+            case 3:
+                startService(new Intent(SensorLoggerService.this, RecorderService.class));
+                break;
+            case 8:
+                ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).cancel(0);
+                stopSelf();
+                break;
+        }
+
+        state = newState;
+    }
+
 }

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

@@ -57,7 +57,6 @@ public class CountdownActivity extends BoundActivity {
             if (time > 0) {
                 handler.postDelayed(task, 500);
             } else {
-                service.setState(3);
                 startActivity(new Intent(this, RecordingActivity.class));
                 finish();
             }

website/index.html

@@ -45,6 +45,7 @@
       <p>The application provides a link to a web-based portal where users can see a graph of their uploaded data, and the results of the activity detection algorithm will also be surfaced there.</p>
       <h4>Changelog</h4>
       <ul>
+       <li><strong>0.2.0 &rarr; 0.2.1</strong>: Bug fix related to turning display off</li>
        <li><strong>0.1.6 &rarr; 0.2.0</strong>: Near-complete rewrite: much improved UI, classification on device, bug fixes</li>
        <li><strong>0.1.5 &rarr; 0.1.6</strong>: Fix force close on devices that use MEIDs not IMEI numbers</li>
        <li><strong>0.1.4 &rarr; 0.1.5</strong>: Make edit boxes single line only</li>