aboutsummaryrefslogtreecommitdiffstats
path: root/test/net
diff options
context:
space:
mode:
authorDanny van Heumen <danny@dannyvanheumen.nl>2014-08-31 22:55:45 +0200
committerDanny van Heumen <danny@dannyvanheumen.nl>2014-09-30 20:28:56 +0200
commitf970c50c8e0f85f8502d32e98c39d1d5b5b9f29c (patch)
tree27014fd0bc9579247ec0ed5b86ada649cc721c3a /test/net
parent9c302d8c96897337b12b60afa9d1d0d5c633f76b (diff)
downloadjitsi-f970c50c8e0f85f8502d32e98c39d1d5b5b9f29c.zip
jitsi-f970c50c8e0f85f8502d32e98c39d1d5b5b9f29c.tar.gz
jitsi-f970c50c8e0f85f8502d32e98c39d1d5b5b9f29c.tar.bz2
Initial support for updated otr4j with support for outgoing message fragmentation.
Modifications include the following: - Updated otr4j which includes support for fragmentation of outgoing messages. The modifications to otr4j to enable outgoing message fragmentation includes breaking the API such that we are able to return more than 1 message after it has been transformed. (Corresponding modifications have been made to AbstractOperationSetBasicInstantMessaging to facilitate the new API.) - Fixed IRC implementation for OperationSetInstantMessageTransform. - Modified AbstractOperationSetBasicInstantMessaging to handle multiple Events returning from a call to messageTransform. - Modified OperationSetBasicInstantMessaging implementations to correspond to changes in AbstractOSBIM. - OTR plugin has been modified to implement the newly added getFragmenterInstructions method which is used to query instructions on desired fragmentation behaviour. - As a temporary solution, a hard dependency has been added to IRC library such that I'm able to test fragmentation behaviour in a real use case until an OperationSet is defined that can be used to query for Instant Messaging transport parameters necessary to determine appropriate fragmentation instructions.
Diffstat (limited to 'test/net')
-rw-r--r--test/net/java/sip/communicator/slick/protocol/generic/PredictableTransformLayer.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/net/java/sip/communicator/slick/protocol/generic/PredictableTransformLayer.java b/test/net/java/sip/communicator/slick/protocol/generic/PredictableTransformLayer.java
index 035cc9b..11d1e0d 100644
--- a/test/net/java/sip/communicator/slick/protocol/generic/PredictableTransformLayer.java
+++ b/test/net/java/sip/communicator/slick/protocol/generic/PredictableTransformLayer.java
@@ -40,7 +40,7 @@ public class PredictableTransformLayer
.getDestinationContact(), evt.getErrorCode());
}
- public MessageDeliveredEvent messageDeliveryPending(
+ public MessageDeliveredEvent[] messageDeliveryPending(
MessageDeliveredEvent evt)
{
logger
@@ -51,8 +51,9 @@ public class PredictableTransformLayer
"DELIVERY_PENDING");
logger.debug("OUT: " + transformedMessage.getContent());
- return new MessageDeliveredEvent(transformedMessage, evt
- .getDestinationContact(), evt.getTimestamp());
+ return new MessageDeliveredEvent[]
+ { new MessageDeliveredEvent(transformedMessage,
+ evt.getDestinationContact(), evt.getTimestamp()) };
}
public MessageReceivedEvent messageReceived(MessageReceivedEvent evt)