From ec9b94c545fc733e49177d6a5755b6a1ee2d7fe5 Mon Sep 17 00:00:00 2001
From: Marc-Olivier Arsenault <marcolivier.arsenault@gmail.com>
Date: Sat, 14 Mar 2015 18:39:36 -0400
Subject: [PATCH] publishing new verison, small bug fixes

---
 AndroidManifest.xml                                   |  4 ++--
 .../marco45/polarheartmonitor/H7ConnectThread.java    | 11 +++++++++++
 src/org/marco45/polarheartmonitor/MainActivity.java   |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c71bba1..7662254 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.marco45.polarheartmonitor"
-    android:versionCode="5"
-    android:versionName="1.4" >
+    android:versionCode="6"
+    android:versionName="1.5" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/src/org/marco45/polarheartmonitor/H7ConnectThread.java b/src/org/marco45/polarheartmonitor/H7ConnectThread.java
index 1fa5a0e..2ddeb2a 100755
--- a/src/org/marco45/polarheartmonitor/H7ConnectThread.java
+++ b/src/org/marco45/polarheartmonitor/H7ConnectThread.java
@@ -23,6 +23,8 @@ public class H7ConnectThread  extends Thread{
 	MainActivity ac;	
 	private BluetoothGatt gat; //gat server
 	private final String HRUUID = "0000180D-0000-1000-8000-00805F9B34FB";
+	static BluetoothGattDescriptor descriptor;
+	static BluetoothGattCharacteristic cc;
 	
 	public H7ConnectThread(BluetoothDevice device, MainActivity ac) {
 		Log.i("H7ConnectThread", "Starting H7 reader BTLE");
@@ -33,6 +35,10 @@ public H7ConnectThread(BluetoothDevice device, MainActivity ac) {
 	
 	/** Will cancel an in-progress connection, and close the socket */
 	public void cancel() {
+		gat.setCharacteristicNotification(cc,false);
+		descriptor.setValue( BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
+	    gat.writeDescriptor(descriptor);
+		
 		gat.disconnect();
 		gat.close();
 		Log.i("H7ConnectThread", "Closing HRsensor");
@@ -76,6 +82,11 @@ public void onServicesDiscovered(final BluetoothGatt gatt, final int status) {
 					for (BluetoothGattDescriptor descriptor : cc.getDescriptors()) {
 					    //find descriptor UUID that matches Client Characteristic Configuration (0x2902)
 					    // and then call setValue on that descriptor
+						
+						//Those two line set the value for the disconnection
+						H7ConnectThread.descriptor=descriptor;
+						H7ConnectThread.cc=cc;
+												
 						gatt.setCharacteristicNotification(cc,true);//Register to updates
 						descriptor.setValue( BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
 					    gatt.writeDescriptor(descriptor);
diff --git a/src/org/marco45/polarheartmonitor/MainActivity.java b/src/org/marco45/polarheartmonitor/MainActivity.java
index 6274f75..8258dc8 100644
--- a/src/org/marco45/polarheartmonitor/MainActivity.java
+++ b/src/org/marco45/polarheartmonitor/MainActivity.java
@@ -237,14 +237,14 @@ public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2,
 		if(arg2!=0){
 			//Actual work
 			DataHandler.getInstance().setID(arg2);
-			if(!h7 && ((BluetoothDevice) pairedDevices.toArray()[DataHandler.getInstance().getID()-1]).getName().contains("H7"))
+			if(!h7 && ((BluetoothDevice) pairedDevices.toArray()[DataHandler.getInstance().getID()-1]).getName().contains("H7") && DataHandler.getInstance().getReader()==null)
 			{
 
 				Log.i("Main Activity", "Starting h7");
 				DataHandler.getInstance().setH7(new H7ConnectThread((BluetoothDevice) pairedDevices.toArray()[DataHandler.getInstance().getID()-1], this));
 				h7=true;
 			}
-			else{
+			else if (!normal && DataHandler.getInstance().getH7()==null){
 
 				Log.i("Main Activity", "Starting normal");
 				DataHandler.getInstance().setReader(new ConnectThread((BluetoothDevice) pairedDevices.toArray()[arg2-1], this));