diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-21 00:09:22 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 00:09:22 +1300 |
| commit | 07c7d5c08583734ae70c5c9e6cec3332726b4200 (patch) | |
| tree | 7c87839c1793a5c21a868b32f31e02b2d161625f /src/org/traccar/smpp/ClientSmppSessionHandler.java | |
| parent | 7fc40b50d77b5724473ffd91e8d1b00418c27cc2 (diff) | |
| parent | 696ac56a6174a5ebfec939871a579ba54ee96963 (diff) | |
| download | traccar-server-07c7d5c08583734ae70c5c9e6cec3332726b4200.tar.gz traccar-server-07c7d5c08583734ae70c5c9e6cec3332726b4200.tar.bz2 traccar-server-07c7d5c08583734ae70c5c9e6cec3332726b4200.zip | |
Merge pull request #3022 from Abyss777/pnone_device
Handle incoming SMS from devices as Event
Diffstat (limited to 'src/org/traccar/smpp/ClientSmppSessionHandler.java')
| -rw-r--r-- | src/org/traccar/smpp/ClientSmppSessionHandler.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/smpp/ClientSmppSessionHandler.java b/src/org/traccar/smpp/ClientSmppSessionHandler.java index 2a538a40f..77f75273e 100644 --- a/src/org/traccar/smpp/ClientSmppSessionHandler.java +++ b/src/org/traccar/smpp/ClientSmppSessionHandler.java @@ -16,6 +16,7 @@ */ package org.traccar.smpp; +import org.traccar.events.TextMessageEventHandler; import org.traccar.helper.Log; import com.cloudhopper.commons.charset.CharsetUtil; @@ -49,11 +50,11 @@ public class ClientSmppSessionHandler extends DefaultSmppSessionHandler { + ", State: " + request.getOptionalParameter(SmppConstants.TAG_MSG_STATE).getValueAsByte()); } else { - Log.debug("SMS Message Received: " - + CharsetUtil.decode(((DeliverSm) request).getShortMessage(), - smppClient.mapDataCodingToCharset(((DeliverSm) request).getDataCoding())).trim() - + ", Source Address: " - + ((DeliverSm) request).getSourceAddress().getAddress()); + String sourceAddress = ((DeliverSm) request).getSourceAddress().getAddress(); + String message = CharsetUtil.decode(((DeliverSm) request).getShortMessage(), + smppClient.mapDataCodingToCharset(((DeliverSm) request).getDataCoding())); + Log.debug("SMS Message Received: " + message.trim() + ", Source Address: " + sourceAddress); + TextMessageEventHandler.handleTextMessage(sourceAddress, message); } } response = request.createResponse(); |