Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 13 insertions, 9 deletions

diff --git a/src/org/traccar/smpp/ClientSmppSessionHandler.java b/src/org/traccar/smpp/ClientSmppSessionHandler.java
index 77f75273e..3585f8376 100644
--- a/src/org/traccar/smpp/ClientSmppSessionHandler.java
+++ b/src/org/traccar/smpp/ClientSmppSessionHandler.java
@@ -25,6 +25,7 @@ import com.cloudhopper.smpp.impl.DefaultSmppSessionHandler;
 import com.cloudhopper.smpp.pdu.DeliverSm;
 import com.cloudhopper.smpp.pdu.PduRequest;
 import com.cloudhopper.smpp.pdu.PduResponse;
+import com.cloudhopper.smpp.util.SmppUtil;
 
 public class ClientSmppSessionHandler extends DefaultSmppSessionHandler {
 
@@ -44,16 +45,19 @@ public class ClientSmppSessionHandler extends DefaultSmppSessionHandler {
         PduResponse response = null;
         try {
             if (request instanceof DeliverSm) {
-                if (request.getOptionalParameters() != null) {
-                    Log.debug("SMS Message Delivered: "
-                            + request.getOptionalParameter(SmppConstants.TAG_RECEIPTED_MSG_ID).getValueAsString()
-                            + ", State: "
-                            + request.getOptionalParameter(SmppConstants.TAG_MSG_STATE).getValueAsByte());
+                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);
+
+                boolean isDeliveryReceipt = false;
+                if (smppClient.getDetectDlrByOpts()) {
+                    isDeliveryReceipt = request.getOptionalParameters() != null;
                 } else {
-                    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);
+                    isDeliveryReceipt = SmppUtil.isMessageTypeAnyDeliveryReceipt(((DeliverSm) request).getEsmClass());
+                }
+
+                if (!isDeliveryReceipt) {
                     TextMessageEventHandler.handleTextMessage(sourceAddress, message);
                 }
             }