From acb29fe72e9293c98ea0a9e3885eb962d78e1555 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Mon, 9 May 2016 21:01:38 +0100
Subject: [PATCH] Got the 'install watch appp' function working to install the
 watch app from the phone app package.

---
 Android_Pebble_SD.iml                         | 19 -------------------
 .../openseizuredetector/StartupActivity.java  |  7 +++----
 local.properties                              | 12 ------------
 3 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 Android_Pebble_SD.iml
 delete mode 100644 local.properties

diff --git a/Android_Pebble_SD.iml b/Android_Pebble_SD.iml
deleted file mode 100644
index 55979db..0000000
--- a/Android_Pebble_SD.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Android_Pebble_SD" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index 7278f0b..111263f 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -104,9 +104,7 @@ public class StartupActivity extends Activity {
             @Override
             public void onClick(View view) {
                 Log.v(TAG, "pebble button clicked");
-                mUtil.showToast("pebble button clicked");
-                //mUtil.startPebbleApp();
-                mConnection.mSdServer.mSdDataSource.installWatchApp();
+                mUtil.startPebbleApp();
             }
         });
 
@@ -115,7 +113,8 @@ public class StartupActivity extends Activity {
             @Override
             public void onClick(View view) {
                 Log.v(TAG, "install Osd Watch App button clicked");
-                mUtil.installOsdWatchApp();
+                //mUtil.installOsdWatchApp();
+                mConnection.mSdServer.mSdDataSource.installWatchApp();
             }
         });
 
diff --git a/local.properties b/local.properties
deleted file mode 100644
index 900d5b0..0000000
--- a/local.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Tue May 03 19:40:01 BST 2016
-ndk.dir=/usr/local/android-sdk-linux/ndk-bundle
-sdk.dir=/usr/local/android-sdk-linux