Skip to content

Commit c7b3cfe

Browse files
committed
[receiver] fix double registration of broadcast receivers
1 parent 3349896 commit c7b3cfe

File tree

2 files changed

+11
-28
lines changed

2 files changed

+11
-28
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,6 @@
4040
android:exported="false"
4141
android:foregroundServiceType="dataSync" />
4242

43-
<receiver
44-
android:name=".modules.receiver.MessagesReceiver"
45-
android:enabled="true"
46-
android:exported="true">
47-
<intent-filter>
48-
<action android:name="android.provider.Telephony.SMS_RECEIVED" />
49-
</intent-filter>
50-
<intent-filter>
51-
<action android:name="android.intent.action.DATA_SMS_RECEIVED" />
52-
53-
<data android:scheme="sms" />
54-
<data android:port="53739" />
55-
</intent-filter>
56-
</receiver>
57-
58-
<receiver
59-
android:name=".modules.receiver.MmsReceiver"
60-
android:enabled="true"
61-
android:exported="true"
62-
android:permission="android.permission.BROADCAST_WAP_PUSH">
63-
<intent-filter android:priority="999">
64-
<action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
65-
<data android:mimeType="application/vnd.wap.mms-message" />
66-
</intent-filter>
67-
</receiver>
68-
6943
<service
7044
android:name=".services.PushService"
7145
android:enabled="true"

app/src/main/java/me/capcom/smsgateway/modules/receiver/MessagesReceiver.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,22 @@ class MessagesReceiver : BroadcastReceiver(), KoinComponent {
5555
private val INSTANCE: MessagesReceiver by lazy { MessagesReceiver() }
5656

5757
fun register(context: Context) {
58-
val filter = IntentFilter().apply {
58+
val textFilter = IntentFilter().apply {
5959
addAction(Intents.SMS_RECEIVED_ACTION)
60+
}
61+
context.registerReceiver(
62+
INSTANCE,
63+
textFilter
64+
)
65+
66+
val dataFilter = IntentFilter().apply {
6067
addAction(Intents.DATA_SMS_RECEIVED_ACTION)
68+
addDataScheme("sms")
69+
addDataAuthority("*", "53739")
6170
}
6271
context.registerReceiver(
6372
INSTANCE,
64-
filter
73+
dataFilter
6574
)
6675
}
6776

0 commit comments

Comments
 (0)