Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Refactor the login code to send FCM token
Acho Arnold94b585968170
diff --git a/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt b/android/app/src/main/java/com/httpsms/FirebaseMessagingService.ktindex b17e2038..8f1e448c 100644--- a/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt+++ b/android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt@@ -98,15 +98,15 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {if (Settings.isLoggedIn(this)) {Timber.d("updating SIM1 phone with new fcm token")- val phone = HttpSmsApiService.create(this).updatePhone(Settings.getSIM1PhoneNumber(this), token, Constants.SIM1)- if (phone != null) {- Settings.setUserID(this, phone.userID)+ val response = HttpSmsApiService.create(this).updateFcmToken(Settings.getSIM1PhoneNumber(this), Constants.SIM1, token)+ if (response.first != null) {+ Settings.setUserID(this, response.first!!.userID)}}if(Settings.isDualSIM(this)) {Timber.d("updating SIM2 phone with new fcm token")- HttpSmsApiService.create(this).updatePhone(Settings.getSIM2PhoneNumber(this), token, Constants.SIM2)+ HttpSmsApiService.create(this).updateFcmToken(Settings.getSIM2PhoneNumber(this), Constants.SIM2, token)}}diff --git a/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt b/android/app/src/main/java/com/httpsms/HttpSmsApiService.ktindex 46c3c1e0..5f72dfad 100644--- a/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt+++ b/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt@@ -129,7 +129,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {return true}- fun storeHeartbeat(phoneNumbers: Array<String>, charging: Boolean) {+ fun storeHeartbeat(phoneNumbers: Array<String>, charging: Boolean): Boolean {val body = """{"charging": $charging,@@ -148,11 +148,12 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {if (!response.isSuccessful) {Timber.e("error response [${response.body?.string()}] with code [${response.code}] while sending heartbeat [$body] for phone numbers [${phoneNumbers.joinToString()}]")response.close()- return+ return false}response.close()Timber.i( "heartbeat stored successfully for phone numbers [${phoneNumbers.joinToString()}]" )+ return true}@@ -195,8 +196,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {return true}-- fun updatePhone(phoneNumber: String, fcmToken: String, sim: String): Phone? {+ fun updateFcmToken(phoneNumber: String, sim: String, fcmToken: String): Triple<Phone?, String?, String?> {val body = """{"fcm_token": "$fcmToken",@@ -206,47 +206,27 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {""".trimIndent()val request: Request = Request.Builder()- .url(resolveURL("/v1/phones"))+ .url(resolveURL("/v1/phones/fcm-token")).put(body.toRequestBody(jsonMediaType)).header(apiKeyHeader, apiKey).header(clientVersionHeader, BuildConfig.VERSION_NAME).build()- val response = client.newCall(request).execute()- if (!response.isSuccessful) {- Timber.e("error response [${response.body?.string()}] with code [${response.code}] while sending fcm token [${body}]")- response.close()- return null- }-- val payload = ResponsePhone.fromJson(response.body!!.string())?.data- response.close()- Timber.i("fcm token sent successfully for phone [$phoneNumber] and id [${payload?.id}]" )- return payload- }--- fun validateApiKey(): Pair<String?, String?> {- val request: Request = Request.Builder()- .url(resolveURL("/v1/users/me"))- .header(apiKeyHeader, apiKey)- .header(clientVersionHeader, BuildConfig.VERSION_NAME)- .get()- .build()-try {val response = client.newCall(request).execute()if (!response.isSuccessful) {- Timber.e("error response [${response.body?.string()}] with code [${response.code}] while verifying apiKey [$apiKey]")+ Timber.e("error response [${response.body?.string()}] with code [${response.code}] while updating FCM token [$fcmToken] with apiKey [$apiKey]")response.close()- return Pair("Cannot validate the API key. Check if it is correct and try again.", null)+ return Triple(null,"Cannot validate the API key. Check if it is correct and try again.", null)}response.close()- Timber.i("api key [$apiKey] and server url [$baseURL] are valid" )- return Pair(null, null)+ Timber.i("FCM token submitted correctly with API key [$apiKey] and server url [$baseURL]" )++ val payload = ResponsePhone.fromJson(response.body!!.string())?.data+ return Triple(payload, null, null)} catch (ex: Exception) {- return Pair(null, ex.message)+ return Triple(null, null, ex.message)}}diff --git a/android/app/src/main/java/com/httpsms/LoginActivity.kt b/android/app/src/main/java/com/httpsms/LoginActivity.ktindex 84232d0b..e666bd96 100644--- a/android/app/src/main/java/com/httpsms/LoginActivity.kt+++ b/android/app/src/main/java/com/httpsms/LoginActivity.kt@@ -180,12 +180,18 @@ class LoginActivity : AppCompatActivity() {Timber.d("login button clicked")val error = isGooglePlayServicesAvailable()- if (error != null) {+ if (error != null || Settings.getFcmToken(this) == null) {Timber.d("google play services not installed [${error}]")Toast.makeText(this, error, Toast.LENGTH_SHORT).show()return}+ if (Settings.getFcmToken(this) == null) {+ Timber.d("The FCM token is not set")+ Toast.makeText(this, "Cannot find FCM token. Make sure you have google play services installed", Toast.LENGTH_LONG).show()+ return+ }+loginButton().isEnabled = falseval progressBar = findViewById<LinearProgressIndicator>(R.id.loginProgressIndicator)progressBar.visibility = View.VISIBLE@@ -292,8 +298,20 @@ class LoginActivity : AppCompatActivity() {}Thread {- val response = HttpSmsApiService(apiKey.text.toString(), URI(serverUrl.text.toString().trim())).validateApiKey()- liveData.postValue(response)+ val service = HttpSmsApiService(apiKey.text.toString(), URI(serverUrl.text.toString().trim()))++ var e164PhoneNumber = formatE164(phoneNumber.text.toString().trim())+ var response = service.updateFcmToken(e164PhoneNumber, Constants.SIM1, Settings.getFcmToken(this) ?: "")+ if(response.second != null || response.third != null || !SmsManagerService.isDualSIM(this)) {+ Timber.e("error updating fcm token [${response.second}]")+ liveData.postValue(Pair(response.second, response.third))+ return@Thread+ }++ e164PhoneNumber = formatE164(phoneNumberSIM2.text.toString().trim())+ response = service.updateFcmToken(e164PhoneNumber, Constants.SIM2, Settings.getFcmToken(this) ?: "")++ liveData.postValue(Pair(response.second, response.third))Timber.d("finished validating api URL")}.start()}diff --git a/android/app/src/main/java/com/httpsms/MainActivity.kt b/android/app/src/main/java/com/httpsms/MainActivity.ktindex 277fe674..d691ae6f 100644--- a/android/app/src/main/java/com/httpsms/MainActivity.kt+++ b/android/app/src/main/java/com/httpsms/MainActivity.kt@@ -20,7 +20,6 @@ import androidx.appcompat.app.AppCompatActivityimport androidx.lifecycle.MutableLiveDataimport androidx.work.Constraintsimport androidx.work.ExistingPeriodicWorkPolicy-import androidx.work.ListenableWorker.Resultimport androidx.work.NetworkTypeimport androidx.work.PeriodicWorkRequestBuilderimport androidx.work.WorkManager@@ -203,9 +202,9 @@ class MainActivity : AppCompatActivity() {private fun sendFCMToken(timestamp: Long, context:Context, phoneNumber: String, sim: String) {Thread {- val phone = HttpSmsApiService.create(context).updatePhone(phoneNumber, Settings.getFcmToken(context) ?: "", sim)- if (phone != null) {- Settings.setUserID(context, phone.userID)+ val response = HttpSmsApiService.create(context).updateFcmToken(phoneNumber, sim,Settings.getFcmToken(context) ?: "")+ if (response.first != null) {+ Settings.setUserID(context, response.first!!.userID)Settings.setFcmTokenLastUpdateTimestampAsync(context, timestamp)Timber.i("[${sim}] FCM token uploaded successfully")return@Thread@@ -318,10 +317,10 @@ class MainActivity : AppCompatActivity() {if (exception != null) {Timber.w("heartbeat sending failed with [$exception]")- Toast.makeText(context, exception, Toast.LENGTH_SHORT).show()+ Toast.makeText(context, exception, Toast.LENGTH_LONG).show()return@run}- Toast.makeText(context, "Heartbeat Sent", Toast.LENGTH_SHORT).show()+ Toast.makeText(context, "Heartbeat sent successfully", Toast.LENGTH_SHORT).show()setLastHeartbeatTimestamp(this)}@@ -337,7 +336,10 @@ class MainActivity : AppCompatActivity() {phoneNumbers.add(Settings.getSIM2PhoneNumber(applicationContext))}Timber.w("numbers = [${phoneNumbers.joinToString()}]")- HttpSmsApiService.create(context).storeHeartbeat(phoneNumbers.toTypedArray(), charging)+ val isStored = HttpSmsApiService.create(context).storeHeartbeat(phoneNumbers.toTypedArray(), charging)+ if (!isStored) {+ error = "Could not send heartbeat make sure the phone is connected to the internet"+ }Settings.setHeartbeatTimestampAsync(applicationContext, System.currentTimeMillis())} catch (exception: Exception) {Timber.e(exception)