From 93f9d1ab11ca7091911ca180173fa7a025ec5457 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Mon, 28 Feb 2022 20:33:43 +0000
Subject: [PATCH] Fixed issue with O2sat being displayed as -1% if there is no
 O2 sensor - now shows '---%' for no data.

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79171f4..ef66445 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
-    android:versionCode="93"
-    android:versionName="4.0.0">
+    android:versionCode="94"
+    android:versionName="4.0.0m">
     <!-- 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 90f84c6..281f2e5 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -564,8 +564,13 @@ public class MainActivity extends AppCompatActivity {
                     // Pebble Connected Phrase - use for HR if active instead.
                     tv = (TextView) findViewById(R.id.pebbleTv);
                     if (mConnection.mSdServer.mSdData.mHRAlarmActive) {
-                        tv.setText(getString(R.string.HR_Equals) + mConnection.mSdServer.mSdData.mHR + " bpm\n"
-                                + "O2 Sat = " + mConnection.mSdServer.mSdData.mO2Sat + "%");
+                        if (mConnection.mSdServer.mSdData.mO2Sat>0) {
+                            tv.setText(getString(R.string.HR_Equals) + mConnection.mSdServer.mSdData.mHR + " bpm\n"
+                                    + "O2 Sat = " + mConnection.mSdServer.mSdData.mO2Sat + "%");
+                        } else {
+                            tv.setText(getString(R.string.HR_Equals) + mConnection.mSdServer.mSdData.mHR + " bpm\n"
+                                    + "O2 Sat = ---%");
+                        }
                         if (mConnection.mSdServer.mSdData.mHRAlarmStanding || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) {
                             tv.setBackgroundColor(alarmColour);
                             tv.setTextColor(alarmTextColour);