From 9511b1ee0952e907f1dad2c2d42c52a1fc03d7a3 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Wed, 26 Dec 2018 20:40:39 +0000
Subject: [PATCH] Converted SMS sending to use intent rather than SMSManager

---
 CHANGELOG.md                                        |  3 +++
 app/src/main/AndroidManifest.xml                    |  4 ++--
 .../java/uk/org/openseizuredetector/SdServer.java   | 13 +++++++++++--
 build.gradle                                        | 10 +++++++++-
 gradle/wrapper/gradle-wrapper.properties            |  4 ++--
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe5a9e9..3409cc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
 
+    V2.6.0 - 26dec2018
+        - Changed SMS code to comply with new Google Play Store requirements.
+
 	V2.5.5 - 23feb2018 - Improved logging to help diagnose network problems
 	that result in 'net fault' warnings from network data source
 	('wifi-storms').
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f76218c..09e2032 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
-    android:versionCode="41"
-    android:versionName="2.5.5">
+    android:versionCode="42"
+    android:versionName="2.6">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 25f39c4..5e74b8f 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -658,10 +658,19 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
             Time tnow = new Time(Time.getCurrentTimezone());
             tnow.setToNow();
             String dateStr = tnow.format("%H:%M:%S %d/%m/%Y");
-            SmsManager sm = SmsManager.getDefault();
+            // SmsManager sm = SmsManager.getDefault();
             for (int i = 0; i < mSMSNumbers.length; i++) {
                 Log.v(TAG, "sendSMSAlarm() - Sending to " + mSMSNumbers[i]);
-                sm.sendTextMessage(mSMSNumbers[i], null, mSMSMsgStr + " - " + dateStr, null, null);
+                // 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", mSMSMsgStr + " - " + dateStr);
+                intent.putExtra("address", new String(mSMSNumbers[i]));
+                if (intent.resolveActivity(getPackageManager()) != null) {
+                    startActivity(intent);
+                } else {
+                    Log.v(TAG, "sendSMSAlarm() - Failed to send SMS.");
+                }
             }
         } else {
             Log.v(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");
diff --git a/build.gradle b/build.gradle
index 3a4494c..2f60b76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,22 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 76226d3..d791226 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Dec 03 09:39:36 GMT 2017
+#Wed Dec 26 18:31:40 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip