From 354f9c6fa253d2e851d96ae977ff1ee3a30f4eeb Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Tue, 19 Jul 2016 22:35:25 +0100
Subject: [PATCH] v2.0.6 - stop watch app before starting to improve
 reliability

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../SdDataSourcePebble.java                   | 15 ++++++++++---
 .../main/res/xml/pebble_datasource_prefs.xml  | 22 ++++++++++---------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4cc75c..d73a593 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
-    android:versionCode="26"
-    android:versionName="2.0.5">
+    android:versionCode="27"
+    android:versionName="2.0.6">
 
     <uses-sdk android:minSdkVersion="14" />
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
index 120f851..192599c 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
@@ -469,9 +469,18 @@ public class SdDataSourcePebble extends SdDataSource {
      * Attempt to start the pebble_sd watch app on the pebble watch.
      */
     public void startWatchApp() {
-        Log.v(TAG, "startWatchApp()");
-        PebbleKit.startAppOnPebble(mContext, SD_UUID);
-
+        Log.v(TAG, "startWatchApp() - closing app first");
+        // first close the watch app if it is running.
+        PebbleKit.closeAppOnPebble(mContext, SD_UUID);
+        // then start it after a 1 second delay.
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Log.v(TAG, "startWatchApp() - starting watch app...");
+                PebbleKit.startAppOnPebble(mContext, SD_UUID);
+            }
+        }, 1000);
     }
 
     /**
diff --git a/app/src/main/res/xml/pebble_datasource_prefs.xml b/app/src/main/res/xml/pebble_datasource_prefs.xml
index 9d5ea5f..50c535d 100644
--- a/app/src/main/res/xml/pebble_datasource_prefs.xml
+++ b/app/src/main/res/xml/pebble_datasource_prefs.xml
@@ -6,7 +6,7 @@
         <EditTextPreference
             android:defaultValue="5"
             android:key="PebbleUpdatePeriod"
-            android:summary="Time period at which data is sent to the phone."
+            android:summary="Time period at which data is sent to the phone (increase value to reduce battery consumption)"
             android:title="Data Period (sec)" />
         <EditTextPreference
             android:defaultValue="300"
@@ -20,14 +20,6 @@
             android:title="Manual Alarm Period (sec)" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Seizure Detector Settings">
-        <ListPreference
-            android:key="PebbleDebug"
-            android:title="Seizure Detector Debug Mode"
-            android:summary="Set Debug mode on or off."
-            android:entries="@array/pebble_debug_list"
-            android:entryValues="@array/pebble_debug_values"
-            android:defaultValue="0"
-            android:dialogTitle="Select Debug Mode" />
         <ListPreference
             android:key="PebbleDisplaySpectrum"
             android:title="Spectrum display Mode"
@@ -51,7 +43,9 @@
             android:entries="@array/pebble_sample_freq_list"
             android:entryValues="@array/pebble_sample_freq_list_values"
             android:defaultValue="100"
-            android:dialogTitle="Select Sample Frequency" />
+            android:dialogTitle="Select Sample Frequency"
+            android:enabled="false"
+            />
 
         <EditTextPreference
             android:defaultValue="3"
@@ -110,6 +104,14 @@
 
     <PreferenceCategory
         android:title="Watch Communications Settings">
+        <ListPreference
+            android:key="PebbleDebug"
+            android:title="Seizure Detector Debug Mode"
+            android:summary="Set Debug mode on or off."
+            android:entries="@array/pebble_debug_list"
+            android:entryValues="@array/pebble_debug_values"
+            android:defaultValue="0"
+            android:dialogTitle="Select Debug Mode" />
         <EditTextPreference
             android:defaultValue="10"
             android:key="AppRestartTimeout"