From 59d3c79ed54a638d751e19b86515401edcebb67a Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 13 Apr 2019 14:13:37 +0200
Subject: [PATCH 1/2] Split up receivers for local BG broadcasts and SMS.

Receiving local BG values probably fails silently when SMS
permission is not granted (due to SMS plugin not being used).
---
 app/src/main/AndroidManifest.xml              | 39 ++++++++++++-------
 .../androidaps/receivers/SmsReceiver.java     |  3 ++
 2 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 179fc23373..e7ec8493be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -73,31 +73,40 @@
         <activity android:name=".plugins.pump.danaRS.activities.PairingHelperActivity" />
         <activity android:name=".activities.HistoryBrowseActivity" />
 
+        <!-- Receive new BG readings from other local aaps -->
         <receiver
-            android:name=".receivers.DataReceiver"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.BROADCAST_SMS">
+                android:name=".receivers.DataReceiver"
+                android:enabled="true"
+                android:exported="true">
             <intent-filter>
-
-                <!-- Receive new SMS messages -->
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
                 <!-- Receiver from xDrip -->
-                <action android:name="com.eveningoutpost.dexdrip.BgEstimate" />
+                <action android:name="com.eveningoutpost.dexdrip.BgEstimate"/>
                 <!-- Receiver from 640g uploader -->
-                <action android:name="com.eveningoutpost.dexdrip.NS_EMULATOR" />
+                <action android:name="com.eveningoutpost.dexdrip.NS_EMULATOR"/>
                 <!-- Receiver from glimp -->
-                <action android:name="it.ct.glicemia.ACTION_GLUCOSE_MEASURED" />
+                <action android:name="it.ct.glicemia.ACTION_GLUCOSE_MEASURED"/>
                 <!-- Receiver from DexcomG5 -->
-                <action android:name="com.dexcom.cgm.DATA" />
-                <action android:name="com.dexcom.cgm.AndroidAPSEVGCallback.BROADCAST" />
-                <action android:name="com.dexcom.cgm.g5.AndroidAPSEVGCallback.BROADCAST" />
+                <action android:name="com.dexcom.cgm.DATA"/>
+                <action android:name="com.dexcom.cgm.AndroidAPSEVGCallback.BROADCAST"/>
+                <action android:name="com.dexcom.cgm.g5.AndroidAPSEVGCallback.BROADCAST"/>
                 <!-- Receiver from Poctech -->
-                <action android:name="com.china.poctech.data" />
+                <action android:name="com.china.poctech.data"/>
                 <!-- Receiver from Tomato -->
-                <action android:name="com.fanqies.tomatofn.BgEstimate" />
+                <action android:name="com.fanqies.tomatofn.BgEstimate"/>
             </intent-filter>
         </receiver>
+
+        <!-- Receive new SMS messages -->
+        <receiver
+                android:name=".receivers.SmsReceiver"
+                android:enabled="true"
+                android:exported="true"
+                android:permission="android.permission.BROADCAST_SMS">
+            <intent-filter>
+                <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
+            </intent-filter>
+        </receiver>
+
         <!-- Receiver keepalive, scheduled every 30 min -->
         <receiver android:name=".receivers.KeepAliveReceiver" />
 
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
new file mode 100644
index 0000000000..5a0cb6a803
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.receivers;
+
+public class SmsReceiver extends DataReceiver {}

From e27f16f5f8b3603fe05ad7d2bdb959c42afd152e Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sun, 14 Apr 2019 17:55:43 +0200
Subject: [PATCH 2/2] Javadoc.

---
 app/src/main/AndroidManifest.xml                              | 2 +-
 .../info/nightscout/androidaps/receivers/SmsReceiver.java     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e7ec8493be..3eaa81ba45 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -73,7 +73,7 @@
         <activity android:name=".plugins.pump.danaRS.activities.PairingHelperActivity" />
         <activity android:name=".activities.HistoryBrowseActivity" />
 
-        <!-- Receive new BG readings from other local aaps -->
+        <!-- Receive new BG readings from other local apps -->
         <receiver
                 android:name=".receivers.DataReceiver"
                 android:enabled="true"
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
index 5a0cb6a803..f527375349 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
@@ -1,3 +1,7 @@
 package info.nightscout.androidaps.receivers;
 
+/**
+ * Forward received SMS intents. This is a separate class, because unlike local broadcasts handled by DataReceiver,
+ * receiving SMS requires a special permission in the manifest, which necessitates a separate receiver.
+ */
 public class SmsReceiver extends DataReceiver {}