Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

fix(android): harden SMS delivery

Acho Arnold Ewine8a750131257
diff --git a/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt b/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt
index e4113289..244b68cf 100644
--- a/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt
+++ b/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt
@@ -145,6 +145,13 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
}
val message = getMessage(applicationContext, messageID) ?: return Result.failure()
+
+ if (message.contact.isBlank()) {
+ Timber.w("message contact is blank, stopping processing")
+ handleFailed(applicationContext, messageID, "The contact phone number is empty.")
+ return Result.failure()
+ }
+
if (!Settings.getActiveStatus(applicationContext, message.sim)) {
Timber.w("[${message.sim}] SIM is not active, stopping processing")
handleFailed(applicationContext, messageID, "Outgoing messages have been disabled on the mobile app")
diff --git a/android/app/src/main/java/com/httpsms/SmsManagerService.kt b/android/app/src/main/java/com/httpsms/SmsManagerService.kt
index c96a90a0..38276f04 100644
--- a/android/app/src/main/java/com/httpsms/SmsManagerService.kt
+++ b/android/app/src/main/java/com/httpsms/SmsManagerService.kt
@@ -36,7 +36,7 @@ class SmsManagerService {
} else {
context.getSystemService(SubscriptionManager::class.java)
}
- return localSubscriptionManager.activeSubscriptionInfoList!!.size > 1
+ return (localSubscriptionManager.activeSubscriptionInfoList?.size ?: 0) > 1
}
}
@@ -45,11 +45,38 @@ class SmsManagerService {
}
fun sendMultipartMessage(context: Context, contact: String, parts: ArrayList<String>, sim: String, sendIntents: ArrayList<PendingIntent>, deliveryIntents: ArrayList<PendingIntent>) {
- getSmsManager(context, sim).sendMultipartTextMessage(contact, null, parts, sendIntents, deliveryIntents)
+ 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
+ }
+ }
}
fun sendTextMessage(context: Context, contact: String, content: String, sim: String, sentIntent:PendingIntent, deliveryIntent: PendingIntent) {
- getSmsManager(context, sim).sendTextMessage(contact, null, content, sentIntent, deliveryIntent)
+ try {
+ getSmsManager(context, sim).sendTextMessage(contact, null, content, sentIntent, deliveryIntent)
+ } catch (e: NullPointerException) {
+ if (e.message?.contains("EmergencyNumber.getNumber()") == true) {
+ Timber.w(e, "Caught EmergencyNumber NPE, falling back to default SmsManager")
+ getDefaultSmsManager(context).sendTextMessage(contact, null, content, sentIntent, deliveryIntent)
+ } else {
+ throw e
+ }
+ }
+ }
+
+ @Suppress("DEPRECATION")
+ private fun getDefaultSmsManager(context: Context): SmsManager {
+ return if (Build.VERSION.SDK_INT >= 31) {
+ context.getSystemService(SmsManager::class.java)
+ } else {
+ SmsManager.getDefault()
+ }
}
@Suppress("DEPRECATION")
@@ -61,15 +88,21 @@ class SmsManagerService {
context.getSystemService(SubscriptionManager::class.java)
}
- Timber.d("active subscription info size: [${localSubscriptionManager.activeSubscriptionInfoList!!.size}]")
- val subscriptionId = if (sim == Constants.SIM1 && localSubscriptionManager.activeSubscriptionInfoList!!.isNotEmpty()) {
- localSubscriptionManager.activeSubscriptionInfoList!![0].subscriptionId
- } else if (sim == Constants.SIM2 && localSubscriptionManager.activeSubscriptionInfoList!!.size > 1) {
- localSubscriptionManager.activeSubscriptionInfoList!![1].subscriptionId
+ val infoList = localSubscriptionManager.activeSubscriptionInfoList
+ Timber.d("active subscription info size: [${infoList?.size ?: 0}]")
+
+ val subscriptionId = if (sim == Constants.SIM1 && !infoList.isNullOrEmpty()) {
+ infoList[0].subscriptionId
+ } else if (sim == Constants.SIM2 && (infoList?.size ?: 0) > 1) {
+ infoList!![1].subscriptionId
} else{
SubscriptionManager.getDefaultSmsSubscriptionId()
}
+ if (subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ return getDefaultSmsManager(context)
+ }
+
return if (Build.VERSION.SDK_INT < 31) {
SmsManager.getSmsManagerForSubscriptionId(subscriptionId)
} else {
diff --git a/android/gradle/gradle-daemon-jvm.properties b/android/gradle/gradle-daemon-jvm.properties
index 6c1139ec..8b531692 100644
--- a/android/gradle/gradle-daemon-jvm.properties
+++ b/android/gradle/gradle-daemon-jvm.properties
@@ -1,12 +1,13 @@
#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
-toolchainVersion=21
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/5c55020ad1e1758e65cf84d78a6991d9/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/057be4d72513d094c747045acda26562/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/5c55020ad1e1758e65cf84d78a6991d9/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/057be4d72513d094c747045acda26562/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/690f22c7d5fabdba81db34b2bcbdfd40/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/19d7c2d18fdc600f184666745a0567c4/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/5c55020ad1e1758e65cf84d78a6991d9/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/057be4d72513d094c747045acda26562/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/38d4fc46de6f02af9912aa3f66104600/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/34480c4bfcee5d3bd65f2a0592c5217b/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=25
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index ff340ba9..731777d4 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 23 15:32:32 EEST 2022
+#Sun Aug 23 12:56:53 EEST 2026
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 75be430a..e3069c21 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -5,6 +5,9 @@ pluginManagement {
mavenCentral()
}
}
+plugins {
+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {