From 5092d120a72d10be949d74bdeaafbf94cb76e566 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 27 Apr 2017 15:21:10 +0200
Subject: [PATCH] ii

---
 .../java/org/surfsite/iconsole/BluetoothChatFragment.java | 2 +-
 .../src/main/java/org/surfsite/iconsole/MainActivity.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Application/src/main/java/org/surfsite/iconsole/BluetoothChatFragment.java b/Application/src/main/java/org/surfsite/iconsole/BluetoothChatFragment.java
index a80b9eb..d044d11 100644
--- a/Application/src/main/java/org/surfsite/iconsole/BluetoothChatFragment.java
+++ b/Application/src/main/java/org/surfsite/iconsole/BluetoothChatFragment.java
@@ -126,7 +126,7 @@ public class BluetoothChatFragment extends Fragment {
             mChatService.stopBT();
         }
         Log.d(TAG, "onDestroy()");
-
+        doUnbindService();
         super.onDestroy();
     }
 
diff --git a/Application/src/main/java/org/surfsite/iconsole/MainActivity.java b/Application/src/main/java/org/surfsite/iconsole/MainActivity.java
index 7940499..734326b 100644
--- a/Application/src/main/java/org/surfsite/iconsole/MainActivity.java
+++ b/Application/src/main/java/org/surfsite/iconsole/MainActivity.java
@@ -60,6 +60,7 @@ public class MainActivity extends FragmentActivity {
             transaction.commit();
         }
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         ComponentName componentName = startService(new Intent(this, BluetoothChatService.class));
         if (componentName == null)
             Log.e(TAG, "componentName == null");
@@ -119,4 +120,11 @@ public class MainActivity extends FragmentActivity {
         Log.i(TAG, "Ready");
     }
     */
+
+    @Override
+    protected void onDestroy() {
+        stopService(new Intent(this, BluetoothChatService.class));
+
+        super.onDestroy();
+    }
 }