mirror/textbee
1
0
Fork 0
mirror of https://github.com/vernu/textbee.git synced 2026-05-05 14:13:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(android): update sms payload fields

Browse Source
This commit is contained in:
isra el
2024-04-15 02:11:23 +03:00
parent 646e7f11b6
commit a09510bc82
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
android/app/src/main/java/com/vernu/sms/models/SMSPayload.java
View File

@@ -1,27 +1,30 @@
package com.vernu.sms.models;
public class SMSPayload {
private String[] recipients;
private String message;
// Legacy fields that are no longer used
private String[] receivers;
private String smsBody;
public SMSPayload(String[] receivers, String smsBody) {
this.receivers = receivers;
this.smsBody = smsBody;
public SMSPayload() {
}
public String[] getReceivers() {
return receivers;
public String[] getRecipients() {
return recipients;
}
public void setReceivers(String[] receivers) {
this.receivers = receivers;
public void setRecipients(String[] recipients) {
this.recipients = recipients;
}
public String getSmsBody() {
return smsBody;
public String getMessage() {
return message;
}
public void setSmsBody(String smsBody) {
this.smsBody = smsBody;
public void setMessage(String message) {
this.message = message;
}
}

16
android/app/src/main/java/com/vernu/sms/services/FCMService.java
View File

@@ -9,42 +9,40 @@ import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.util.Log;
import androidx.core.app.NotificationCompat;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
import com.google.gson.Gson;
import com.vernu.sms.AppConstants;
import com.vernu.sms.R;
import com.vernu.sms.activities.MainActivity;
import com.vernu.sms.helpers.SMSHelper;
import com.vernu.sms.helpers.SharedPreferenceHelper;
import com.vernu.sms.models.SMSPayload;
public class FCMService extends FirebaseMessagingService {
private static final String TAG = "MyFirebaseMsgService";
private static final String TAG = "FirebaseMessagingService";
private static final String DEFAULT_NOTIFICATION_CHANNEL_ID = "N1";
@Override
public void onMessageReceived(RemoteMessage remoteMessage) {
Log.d("FCM_MESSAGE", remoteMessage.getData().toString());
Log.d(TAG, remoteMessage.getData().toString());
Gson gson = new Gson();
SMSPayload smsPayload = gson.fromJson(remoteMessage.getData().get("smsData"), SMSPayload.class);
// Check if message contains a data payload.
if (remoteMessage.getData().size() > 0) {
int preferedSim = SharedPreferenceHelper.getSharedPreferenceInt(this, "PREFERED_SIM", -1);
for (String receiver : smsPayload.getReceivers()) {
int preferedSim = SharedPreferenceHelper.getSharedPreferenceInt(this, AppConstants.SHARED_PREFS_PREFERRED_SIM_KEY, -1);
for (String receiver : smsPayload.getRecipients()) {
if(preferedSim == -1) {
SMSHelper.sendSMS(receiver, smsPayload.getSmsBody());
SMSHelper.sendSMS(receiver, smsPayload.getMessage());
continue;
}
try {
SMSHelper.sendSMSFromSpecificSim(receiver, smsPayload.getSmsBody(), preferedSim);
SMSHelper.sendSMSFromSpecificSim(receiver, smsPayload.getMessage(), preferedSim);
} catch(Exception e) {
Log.d("SMS_SEND_ERROR", e.getMessage());
}