From 092802cf1daed613aa7493a548fc53f4b66f9644 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Tue, 27 Feb 2024 13:23:54 +0000
Subject: [PATCH] Made mainactivity 'exit' menu function the same as
 mainactivity2 for consistency.

---
 CHANGELOG.md                                                  | 1 +
 app/src/main/AndroidManifest.xml                              | 4 ++--
 .../main/java/uk/org/openseizuredetector/MainActivity.java    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6135216..a47e9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
+    V4.2.1 - Added support for PineTime wathes using the Bluetooth Data Source
     V4.1.0 - Added experimental support for neural network based seizure detector.
     V4.0.7 - Improvements to Data Sharing data log manager screen
         - Removed automatic refresh of shared data events list (Issue #62)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 106ce7a..28bcc5d 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"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="135"
-    android:versionName="4.2.1">
+    android:versionCode="136"
+    android:versionName="4.2.2">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 2b98bf8..2816289 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -282,6 +282,8 @@ public class MainActivity extends AppCompatActivity {
                     Log.i(TAG, "Stopping Server");
                     mUtil.unbindFromServer(getApplicationContext(), mConnection);
                     stopServer();
+                    // we exit the activity when the server is stopped to make it consistent with MainActivity2
+                    finish();
                 } else {
                     Log.i(TAG, "Starting Server");
                     startServer();