Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
refactor: centralize SmsManager fallback logic for EmergencyNumber NPE
Acho Arnold Ewin1e7bda772bf3
diff --git a/android/app/src/main/java/com/httpsms/SmsManagerService.kt b/android/app/src/main/java/com/httpsms/SmsManagerService.ktindex 38276f04..1236bb54 100644--- a/android/app/src/main/java/com/httpsms/SmsManagerService.kt+++ b/android/app/src/main/java/com/httpsms/SmsManagerService.kt@@ -45,31 +45,41 @@ class SmsManagerService {}fun sendMultipartMessage(context: Context, contact: String, parts: ArrayList<String>, sim: String, sendIntents: ArrayList<PendingIntent>, deliveryIntents: ArrayList<PendingIntent>) {- try {- getSmsManager(context, sim).sendMultipartTextMessage(contact, null, parts, sendIntents, deliveryIntents)- } catch (e: NullPointerException) {- if (e.message?.contains("EmergencyNumber.getNumber()") == true) {- Timber.w(e, "Caught EmergencyNumber NPE, falling back to default SmsManager")- getDefaultSmsManager(context).sendMultipartTextMessage(contact, null, parts, sendIntents, deliveryIntents)- } else {- throw e- }+ runSmsAction(context, sim) { smsManager ->+ smsManager.sendMultipartTextMessage(contact, null, parts, sendIntents, deliveryIntents)+ }+ }++ fun sendTextMessage(context: Context, contact: String, content: String, sim: String, sentIntent: PendingIntent, deliveryIntent: PendingIntent) {+ runSmsAction(context, sim) { smsManager ->+ smsManager.sendTextMessage(contact, null, content, sentIntent, deliveryIntent)+ }+ }++ // Wrapper for the smsManager's sendMultimediaMessage+ fun sendMultimediaMessage(context: Context, pduUri: android.net.Uri, sim: String, sentIntent: PendingIntent) {+ runSmsAction(context, sim) { smsManager ->+ smsManager.sendMultimediaMessage(context, pduUri, null, null, sentIntent)}}- fun sendTextMessage(context: Context, contact: String, content: String, sim: String, sentIntent:PendingIntent, deliveryIntent: PendingIntent) {+ private fun runSmsAction(context: Context, sim: String, action: (SmsManager) -> Unit) {try {- getSmsManager(context, sim).sendTextMessage(contact, null, content, sentIntent, deliveryIntent)+ action(getSmsManager(context, sim))} catch (e: NullPointerException) {- if (e.message?.contains("EmergencyNumber.getNumber()") == true) {+ if (e.isEmergencyNumberBug()) {Timber.w(e, "Caught EmergencyNumber NPE, falling back to default SmsManager")- getDefaultSmsManager(context).sendTextMessage(contact, null, content, sentIntent, deliveryIntent)+ action(getDefaultSmsManager(context))} else {throw e}}}+ private fun Throwable.isEmergencyNumberBug(): Boolean {+ return this is NullPointerException && this.message?.contains("EmergencyNumber.getNumber()") == true+ }+@Suppress("DEPRECATION")private fun getDefaultSmsManager(context: Context): SmsManager {return if (Build.VERSION.SDK_INT >= 31) {@@ -109,10 +119,4 @@ class SmsManagerService {context.getSystemService(SmsManager::class.java).createForSubscriptionId(subscriptionId)}}-- // Wrapper for the smsManager's sendMultimediaMessage- fun sendMultimediaMessage(context: Context, pduUri: android.net.Uri, sim: String, sentIntent: PendingIntent) {- val smsManager = getSmsManager(context, sim)- smsManager.sendMultimediaMessage(context, pduUri, null, null, sentIntent)- }}