Fixed the registration of delivered and sent receivers · suryatmodulus/httpsms@daac5ff · GitHub

suryatmodulus / httpsms Public

forked from NdoleStudio/httpsms

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit daac5ff

Browse filesBrowse the repository at this point in the historyBrowse files

AchoArnold

committed

Fixed the registration of delivered and sent receivers

1 parent af43829 commit daac5ff
Copy full SHA for daac5ff

4 files changed

+26-23Lines changed: 26 additions & 23 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• android
  • app/src/main/java/com/httpsms
    • FirebaseMessagingService.kt
    • MainActivity.kt
    • Receiver.kt
  • settings.gradle

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt‎

Copy file name to clipboardExpand all lines: android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -137,6 +137,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
137	137	return Result.failure()
138	138	}
139	139
	140	+ Receiver.register(applicationContext)
140	141	val parts = getMessageParts(applicationContext, message)
141	142	if (parts.size == 1) {
142	143	return handleSingleMessage(message)

Collapse file

‎android/app/src/main/java/com/httpsms/MainActivity.kt‎

Copy file name to clipboardExpand all lines: android/app/src/main/java/com/httpsms/MainActivity.kt

-21Lines changed: 0 additions & 21 deletions

Original file line number	Diff line number	Diff line change
@@ -59,7 +59,6 @@ class MainActivity : AppCompatActivity() {
59	59	setCardContent(this)
60	60	registerListeners()
61	61	refreshToken(this)
62		- registerReceivers(this)
63	62
64	63	startStickyNotification(this)
65	64	scheduleHeartbeatWorker(this)
@@ -87,26 +86,6 @@ class MainActivity : AppCompatActivity() {
87	86	appVersionView.text = format(getString(R.string.app_version), BuildConfig.VERSION_NAME)
88	87	}
89	88
90		- private fun registerReceivers(context: Context) {
91		- if(sentReceiver == null) {
92		- Timber.d("registering [sent] receiver for intent [${SmsManagerService.sentAction()}]")
93		- sentReceiver = SentReceiver()
94		- context.registerReceiver(
95		- sentReceiver,
96		- IntentFilter(SmsManagerService.sentAction())
97		- )
98		- }
99		-
100		- if(deliveredReceiver == null) {
101		- Timber.d("registering [delivered] receiver for intent [${SmsManagerService.deliveredAction()}]")
102		- deliveredReceiver = DeliveredReceiver()
103		- context.registerReceiver(
104		- deliveredReceiver,
105		- IntentFilter(SmsManagerService.deliveredAction())
106		- )
107		- }
108		- }
109		-
110	89	private fun setCardContent(context: Context) {
111	90	val titleText = findViewById<TextView>(R.id.cardPhoneNumber)
112	91	titleText.text = PhoneNumberUtils.formatNumber(Settings.getSIM1PhoneNumber(this), Locale.getDefault().country)

Collapse file

‎android/app/src/main/java/com/httpsms/Receiver.kt‎

Copy file name to clipboardExpand all lines: android/app/src/main/java/com/httpsms/Receiver.kt

+24-1Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1,10 +1,33 @@
1	1	package com.httpsms
2	2
3	3	import android.content.Context
	4	+ import android.content.IntentFilter
4	5	import timber.log.Timber
5	6
6		-
7	7	object Receiver {
	8	+ private var sentReceiver: SentReceiver? = null;
	9	+ private var deliveredReceiver: DeliveredReceiver? = null;
	10	+
	11	+ fun register(context: Context) {
	12	+ if(sentReceiver == null) {
	13	+ Timber.d("registering [sent] receiver for intent [${SmsManagerService.sentAction()}]")
	14	+ sentReceiver = SentReceiver()
	15	+ context.registerReceiver(
	16	+ sentReceiver,
	17	+ IntentFilter(SmsManagerService.sentAction())
	18	+ )
	19	+ }
	20	+
	21	+ if(deliveredReceiver == null) {
	22	+ Timber.d("registering [delivered] receiver for intent [${SmsManagerService.deliveredAction()}]")
	23	+ deliveredReceiver = DeliveredReceiver()
	24	+ context.registerReceiver(
	25	+ deliveredReceiver,
	26	+ IntentFilter(SmsManagerService.deliveredAction())
	27	+ )
	28	+ }
	29	+ }
	30	+
8	31	fun isValid(context: Context, messageId: String?): Boolean {
9	32	if (messageId == null) {
10	33	Timber.e("cannot handle event because the message ID is null")

Collapse file

‎android/settings.gradle‎

Copy file name to clipboardExpand all lines: android/settings.gradle

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -12,5 +12,5 @@ dependencyResolutionManagement {
12	12	mavenCentral()
13	13	}
14	14	}
15		- rootProject.name = "HttpSMS"
	15	+ rootProject.name = "httpSMS"
16	16	include ':app'

0 commit comments

Comments

0 (0)