From 5f29af46e034e947b4721546036d82eac859aa83 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 22 Mar 2019 13:22:18 -0700
Subject: [PATCH] move SMSReceiver from main manifest to the others

Theory is that the store's buggy site is presenting its
banned-permissions interface because it's detecting a Receiver that
requires SMS_RECEIVE permission even though the permissions themselves
aren't there any more.
---
 xwords4/android/app/src/main/AndroidManifest.xml     |  9 ---------
 xwords4/android/app/src/xw4SMS/AndroidManifest.xml   |  9 +++++++++
 xwords4/android/app/src/xw4d/AndroidManifest.xml     |  9 +++++++++
 .../android/app/src/xw4fdroid/AndroidManifest.xml    | 12 ++++++++++++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index 739d100f9..a86398fde 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -215,15 +215,6 @@
       </intent-filter>
     </receiver>
 
-    <receiver android:name="SMSReceiver" >
-      <intent-filter>
-        <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> 
-        <data android:scheme="sms" /> 
-        <data android:port="@string/nbs_port" /> 
-        <data android:host="*" /> 
-      </intent-filter> 
-    </receiver>
-
     <service android:name="FBMService">
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT" />
diff --git a/xwords4/android/app/src/xw4SMS/AndroidManifest.xml b/xwords4/android/app/src/xw4SMS/AndroidManifest.xml
index 31941dda4..8bc916834 100644
--- a/xwords4/android/app/src/xw4SMS/AndroidManifest.xml
+++ b/xwords4/android/app/src/xw4SMS/AndroidManifest.xml
@@ -22,5 +22,14 @@
 
     <service android:name="WiDirService"/>
 
+    <receiver android:name="SMSReceiver" >
+      <intent-filter>
+        <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
+        <data android:scheme="sms" />
+        <data android:port="@string/nbs_port" />
+        <data android:host="*" />
+      </intent-filter>
+    </receiver>
+
   </application>
 </manifest>
diff --git a/xwords4/android/app/src/xw4d/AndroidManifest.xml b/xwords4/android/app/src/xw4d/AndroidManifest.xml
index 439ac4305..5d20f04f0 100644
--- a/xwords4/android/app/src/xw4d/AndroidManifest.xml
+++ b/xwords4/android/app/src/xw4d/AndroidManifest.xml
@@ -28,5 +28,14 @@
 
     <service android:name="WiDirService"/>
 
+    <receiver android:name="SMSReceiver" >
+      <intent-filter>
+        <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
+        <data android:scheme="sms" />
+        <data android:port="@string/nbs_port" />
+        <data android:host="*" />
+      </intent-filter>
+    </receiver>
+
   </application>
 </manifest>
diff --git a/xwords4/android/app/src/xw4fdroid/AndroidManifest.xml b/xwords4/android/app/src/xw4fdroid/AndroidManifest.xml
index 3cd7f92c0..d0afcd373 100644
--- a/xwords4/android/app/src/xw4fdroid/AndroidManifest.xml
+++ b/xwords4/android/app/src/xw4fdroid/AndroidManifest.xml
@@ -7,4 +7,16 @@
        must be added per-variant !-->
   <uses-permission android:name="android.permission.RECEIVE_SMS" />
   <uses-permission android:name="android.permission.SEND_SMS" />
+
+  <application>
+    <receiver android:name="SMSReceiver" >
+      <intent-filter>
+        <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
+        <data android:scheme="sms" />
+        <data android:port="@string/nbs_port" />
+        <data android:host="*" />
+      </intent-filter>
+    </receiver>
+  </application>
+
 </manifest>