From d44ec7c489dd773d852d2770d80a136af4693126 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Tue, 19 Jul 2016 22:25:06 +0100
Subject: [PATCH] Added code to stop watch app before starting it to try to
 improve reliability of app start.

---
 app/src/main/AndroidManifest.xml                  |  2 +-
 .../openseizuredetector/SdDataSourcePebble.java   | 15 ++++++++++++---
 build.gradle                                      |  2 +-
 local.properties                                  |  5 +++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89b4f24..4658dc6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
     android:versionCode="24"
-    android:versionName="2.0.3" >
+    android:versionName="2.0.3a" >
 
     <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 ee498ce..8ddeb94 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
@@ -401,9 +401,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/build.gradle b/build.gradle
index 93ed0d9..e592b76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 allprojects {
diff --git a/local.properties b/local.properties
index 7e7f3cb..6b806ea 100644
--- a/local.properties
+++ b/local.properties
@@ -7,5 +7,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sat Apr 23 18:39:21 BST 2016
-sdk.dir=/home/graham/Android/Sdk
+#Tue Jul 19 22:15:48 BST 2016
+ndk.dir=/usr/local/android-sdk-linux/ndk-bundle
+sdk.dir=/usr/local/android-sdk-linux