diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96e5348..ddf7a8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
OpenSeizureDetector Android App - Change Log
============================================
+ V3.0.0 - 15feb2019
+ - Updated for Android V9
+ - Added explicity statement of use of SMS permission in notification
+ - Updated to use dynamic permissions
+ - Added support for Garmin Data Source, with Heart Rate alarm (and other network based data sources)
+
V2.6.0 - 26dec2018
- Changed SMS code to comply with new Google Play Store requirements.
- Added Support for Wifi data source (initially to be used for Garmin_SD)
diff --git a/app/release/app-release-3.0.0.apk b/app/release/app-release-3.0.0.apk
new file mode 100644
index 0000000..62d38c4
Binary files /dev/null and b/app/release/app-release-3.0.0.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 8fd5017..e8042dc 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":46,"versionName":"2.6.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":47,"versionName":"3.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 800e019..53e665e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
-
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 05ab950..51d8118 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -786,16 +786,6 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
for (int i = 0; i < mSMSNumbers.length; i++) {
Log.i(TAG, "sendSMSAlarm() - Sending to " + mSMSNumbers[i]);
sendSMS(new String(mSMSNumbers[i]), mSMSMsgStr + " - " + dateStr);
- // sm.sendTextMessage(mSMSNumbers[i], null, mSMSMsgStr + " - " + dateStr, null, null);
- //Intent intent = new Intent(Intent.ACTION_SEND);
- //intent.setDataAndType(Uri.parse("smsto:"), "text/plain");
- //intent.putExtra("sms_body", mSMSMsgStr + " - " + dateStr);
- //intent.putExtra("address", new String(mSMSNumbers[i]));
- //if (intent.resolveActivity(getPackageManager()) != null) {
- // startActivity(intent);
- //} else {
- // Log.e(TAG, "sendSMSAlarm() - Failed to send SMS - can not find activity do do it");
- //}
}
}
} else {
@@ -822,7 +812,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
//mUtil.showToast("onSdLocationReceived() - found location" + ll.toString());
Log.i(TAG, "onSdLocationReceived() - found location" + ll.toString());
if (mSMSAlarm) {
- Log.i(TAG, "onSdLocationReceived() - Sending to " + mSMSNumbers.length + " Numbers");
+ Log.i(TAG, "onSdLocationReceived() - Sending SMS to " + mSMSNumbers.length + " Numbers");
mUtil.writeToSysLogFile("SdServer.sendSMSAlarm()");
Time tnow = new Time(Time.getCurrentTimezone());
tnow.setToNow();
@@ -831,9 +821,6 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
String geoUri = "here";
- //String googleUrl = "https://www.google.com/maps/place?q="
- // +ll.getLatitude()+"%2C"+ll.getLongitude()+
- // "&key=AIzaSyDf-nbkfz9TrhyVRoeS8Mwtq6K2nBpUAts";
String googleUrl = "https://www.google.com/maps/place?q="
+ ll.getLatitude() + "%2C" + ll.getLongitude();
String messageStr = mSMSMsgStr + " - " +
@@ -843,17 +830,6 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
for (int i = 0; i < mSMSNumbers.length; i++) {
Log.i(TAG, "onSdLocationReceived() - Sending to " + mSMSNumbers[i]);
sendSMS(new String(mSMSNumbers[i]), messageStr);
- // sm.sendTextMessage(mSMSNumbers[i], null, mSMSMsgStr + " - " + dateStr, null, null);
- //Intent intent = new Intent(Intent.ACTION_SEND);
- //intent.setDataAndType(Uri.parse("smsto:"), "vnd.android-dir/mms-sms");
- //intent.putExtra("sms_body", messageStr);
- //intent.putExtra("address", new String(mSMSNumbers[i]));
- //if (intent.resolveActivity(getPackageManager()) != null) {
- // Log.e(TAG, "onSdLocationReceived() - sending SMS.");
- // startActivity(intent);
- //} else {
- // Log.e(TAG, "onSdLocationReceived() - Failed to send SMS - can not find activity to do it.");
- //}
}
} else {
Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");
diff --git a/app/src/main/res/values/datasource_list.xml b/app/src/main/res/values/datasource_list.xml
index fcc6732..06374d4 100644
--- a/app/src/main/res/values/datasource_list.xml
+++ b/app/src/main/res/values/datasource_list.xml
@@ -2,15 +2,13 @@
- "Pebble Watch"
- - "Android Wear"
+ - "Garmin Watch"
- "Network"
- - "Garmin"
- "Pebble"
- - "AndroidWear"
- - "Network"
- "Garmin"
+ - "Network"
\ No newline at end of file