X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FSmsReceiver.java;h=b6fce8e6276cd503e97d27993f921c0ad3b27f85;hb=1b6a04801bb78479f9d010cc1d5d8fcca089e013;hp=49d4bea9fad8cedb0501bf3ec883b510a7a037f7;hpb=8dfb76c9431dbf8401412cb92c7512e7dc3081a2;p=fonbot.git diff --git a/src/ro/ieval/fonbot/SmsReceiver.java b/src/ro/ieval/fonbot/SmsReceiver.java index 49d4bea..b6fce8e 100644 --- a/src/ro/ieval/fonbot/SmsReceiver.java +++ b/src/ro/ieval/fonbot/SmsReceiver.java @@ -50,25 +50,24 @@ public final class SmsReceiver extends BroadcastReceiver { final SmsMessage sms=SmsMessage.createFromPdu((byte[]) pdu); final String originAddress=sms.getOriginatingAddress(); if(sms.getMessageBody() == null || originAddress == null) - return; + continue; final String name=Utils.callerId(context, originAddress); + final String body=sms.getMessageBody(); if(name==null) - Utils.sendMessage(context, toNonNull(MessageType.SMS), - toNonNull(context.getString(sms_received_fmt, - originAddress, sms.getMessageBody()))); + Utils.sendMessage(context, toNonNull(MessageType.SMS), sms_received_fmt, + originAddress, body.replace("\n", "\n ")); else - Utils.sendMessage(context, toNonNull(MessageType.SMS), - toNonNull(context.getString(sms_received_fmt, - originAddress+" ("+name+")",sms.getMessageBody()))); + Utils.sendMessage(context, toNonNull(MessageType.SMS), sms_received_fmt, + originAddress+" ("+name+")", body.replace("\n", "\n ")); - final String[] lines=sms.getMessageBody().split("\n"); + final String[] lines=body.split("\n"); final String password = PreferenceManager.getDefaultSharedPreferences(context).getString("smspassword",""); if(password==null||password.length()==0) - return; + continue; if(lines.length==0 || !lines[0].equals(password)) - return; + continue; final Address address=new Address(toNonNull(Protocol.SMS), originAddress);//NOPMD variable depends on originAddress for (int i = 1; i < lines.length; i++) {