gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made mainactivity 'exit' menu function the same as mainactivity2 for consistency.

Browse Source
This commit is contained in:
Graham Jones
2024-02-27 13:23:54 +00:00
parent 61c7668712
commit 092802cf1d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,5 +1,6 @@
OpenSeizureDetector Android App - Change Log 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.1.0 - Added experimental support for neural network based seizure detector.
V4.0.7 - Improvements to Data Sharing data log manager screen V4.0.7 - Improvements to Data Sharing data log manager screen
- Removed automatic refresh of shared data events list (Issue #62) - Removed automatic refresh of shared data events list (Issue #62)

4
app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:versionCode="135" android:versionCode="136"
android:versionName="4.2.1"> android:versionName="4.2.2">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

2
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -282,6 +282,8 @@ public class MainActivity extends AppCompatActivity {
Log.i(TAG, "Stopping Server"); Log.i(TAG, "Stopping Server");
mUtil.unbindFromServer(getApplicationContext(), mConnection); mUtil.unbindFromServer(getApplicationContext(), mConnection);
stopServer(); stopServer();
// we exit the activity when the server is stopped to make it consistent with MainActivity2
finish();
} else { } else {
Log.i(TAG, "Starting Server"); Log.i(TAG, "Starting Server");
startServer(); startServer();