From 7d307529b4a5fb7969bd36b4f9098dba60ce4e85 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Thu, 10 Mar 2022 19:51:23 +0000
Subject: [PATCH] Added cancel buttons to permissions dialogs.   Fixed crash
 from issue #45

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../org/openseizuredetector/LogManager.java   |  8 ++++++--
 .../openseizuredetector/StartupActivity.java  | 20 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index de1b3b2..91a03fc 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="96"
-    android:versionName="4.0.0t">
+    android:versionCode="97"
+    android:versionName="4.0.0v">
     <!-- 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/LogManager.java b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
index 9bb8f99..32ea090 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LogManager.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
@@ -240,8 +240,12 @@ public class LogManager {
                     + DatabaseUtils.sqlEscapeString(sdData.toJSON(true)) + ","
                     + 0
                     + ")";
-            mOsdDb.execSQL(SQLStr);
-            Log.v(TAG, "data written to database");
+            if (mOsdDb != null) {
+                mOsdDb.execSQL(SQLStr);
+                Log.v(TAG, "writeDatapointToLocalDb(): data written to database");
+            } else {
+                Log.e(TAG,"writeDatapointToLocalDb(): mOsdDb is null");
+            }
 
         } catch (SQLException e) {
             Log.e(TAG, "writeToLocalDb(): Error Writing Data: " + e.toString());
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index 85df55a..2ae3acf 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -646,6 +646,11 @@ public class StartupActivity extends AppCompatActivity {
                                     SMS_PERMISSIONS_1,
                                     45);
                         }
+                    })
+                    .setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            dialog.cancel();
+                        }
                     }).create().show();
         }
     }
@@ -666,12 +671,18 @@ public class StartupActivity extends AppCompatActivity {
                     .setPositiveButton(getString(R.string.okBtnTxt), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             dialog.cancel();
-                            Log.i(TAG,"requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()");
+                            Log.i(TAG, "requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()");
                             ActivityCompat.requestPermissions(StartupActivity.this,
                                     LOCATION_PERMISSIONS_1,
                                     43);
                         }
-                    }).create().show();
+                    })
+                    .setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                    })
+                    .create().show();
         }
     }
 
@@ -696,6 +707,11 @@ public class StartupActivity extends AppCompatActivity {
                                     LOCATION_PERMISSIONS_2,
                                     44);
                         }
+                    })
+                    .setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            dialog.cancel();
+                        }
                     }).create().show();
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6565585..f1bcf0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
         "\n
+        \nV4.0.0v - Added BLE Characteristic changes for PineWatch, added cancel buttons to permissions dialogs.
         \nV4.0.0t - Fixed issue with occasional crashes when network disrupted.  Improved 'Prominent Disclosure' of SMS and Location permissions to satisfy Google Play Store requirements.
         \nV4.0.0s - Fixed problem with Android 11 not sending SMS Location alerts.
         \nV4.0.0p - Restored compatibility with Android V6