V2.6.1 - Explicitly request SMS permission, and provide warnings in notification if active.

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"2.6.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":43,"versionName":"2.6.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/java/uk/org/openseizuredetector/PrefActivity.java

@@ -140,6 +140,12 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
             }
         }, 100);
 
+        if (s.equals("DataSource")) {
+            Log.i(TAG,"DataSource Changed - re-starting PrefActivity to refresh list");
+            finish();
+            startActivity(getIntent());
+        }
+
     }
 
 

app/src/main/java/uk/org/openseizuredetector/SdServer.java

@@ -747,6 +747,10 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
      */
     public void sendSMSAlarm() {
         if (mSMSAlarm) {
+            if (!mUtil.areSMSPermissionsOK()) {
+                mUtil.showToast("ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+                Log.e(TAG,"ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+            } else {
                 mLocationFinder.getLocation(this);
                 Location loc = mLocationFinder.getLastLocation();
                 if (loc != null) {
@@ -776,6 +780,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
                     //    Log.e(TAG, "sendSMSAlarm() - Failed to send SMS - can not find activity do do it");
                     //}
                 }
+            }
         } else {
             Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");
             Toast toast = Toast.makeText(getApplicationContext(),

app/src/main/java/uk/org/openseizuredetector/StartupActivity.java

@@ -110,7 +110,6 @@ public class StartupActivity extends Activity {
         PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.garmin_datasource_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.seizure_detector_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.network_passive_datasource_prefs, true);
 
@@ -491,6 +490,8 @@ public class StartupActivity extends Activity {
                             + "\n\nChanges in this version:"
                             + "\n- Upgraded to be compatible with Android Version 8 (a requirement of Google Play Store)"
                             + "\n- Added support for an experimental Gramin based seizure detector with Heart Rate alarm  "
+                            + "\n  Fixed problem with app not restarting properly when settings were changed"
+                            + "\n- Explicitly asks for SMS permission, and displays warning in notification if SMS alarms are active"
                             + "\n  "
                             + "\n  PLEASE NOTE - THIS IS A BETA TEST VERSION SO MAY NOT WORK!"
                             + "\n  ."
@@ -525,9 +526,11 @@ public class StartupActivity extends Activity {
                             + "\n\nChanges in this version:"
                             + "\n- Upgraded to be compatible with Android Version 8 (a requirement of Google Play Store)"
                             + "\n- Added support for an experimental Gramin based seizure detector with Heart Rate alarm  "
+                            + "\n- Fixed problem with app not restarting properly when settings were changed"
+                            + "\n- Explicitly asks for SMS permission, and displays warning in notification if SMS alarms are active"
                             + "\n  "
                             + "\n  PLEASE NOTE - THIS IS A BETA TEST VERSION SO MAY NOT WORK!"
-                            + "\n- "
+                            + "\n "
             );
             // This makes the links display as links, but they do not respond to clicks for some reason...
             Linkify.addLinks(s, Linkify.ALL);

app/src/main/res/xml/garmin_datasource_prefs.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="Heart Rate Alarm Settings">
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="HRAlarmActive"
-        android:summary=""
-        android:title="Heart Rate Alarm Enabled" />
-    <EditTextPreference
-        android:defaultValue="40"
-        android:key="HRThreshMin"
-        android:summary=""
-        android:title="Heart Rate Min Threshold (bpm)" />
-    <EditTextPreference
-        android:defaultValue="150"
-        android:key="HRThreshMax"
-        android:summary=""
-        android:title="Heart Rate Max Threshold (bpm)" />
-    </PreferenceCategory>
-</PreferenceScreen>

app/src/main/res/xml/preference_headers.xml

@@ -19,8 +19,8 @@
 
     <header android:fragment="uk.org.openseizuredetector.PrefActivity$PebbleDatasourcePrefsFragment"
         android:icon="@drawable/icon_24x24"
-        android:title="Network Datasource"
+        android:title="Pebble Datasource"
-        android:summary="Network Datasource Preferences" />
+        android:summary="Pebble Datasource Preferences" />
 
     <header android:fragment="uk.org.openseizuredetector.PrefActivity$NetworkDatasourcePrefsFragment"
         android:icon="@drawable/icon_24x24"