Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-17 02:22:32 (GMT) |
|---|---|---|
| committer | Nick Hudson <nick.hudson@isode.com> | 2015-07-28 13:14:20 (GMT) |
| commit | 673655830b0325d964e67fa835ea83f485e9beeb (patch) | |
| tree | 27e4f8bd20dd9011207641a83212ced393fbada2 /src/com/isode/stroke/session | |
| parent | 6f84f6a65b8b80e2f599dff76da0cd13fbead611 (diff) | |
| download | stroke-673655830b0325d964e67fa835ea83f485e9beeb.zip stroke-673655830b0325d964e67fa835ea83f485e9beeb.tar.bz2 | |
Complete StreamStack and add tests.
TLSLayer could not be updated because it requires TLS to be ported first.
Updates other classes, only for having compatibility with SafeByteArray because of updates in Stream Stack.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for StreamStack and XMPPLayer, which passes.
Change-Id: I8707fc1f16d622d2a90f6f39f671b7e7c46aa170
Diffstat (limited to 'src/com/isode/stroke/session')
| -rw-r--r-- | src/com/isode/stroke/session/BasicSessionStream.java | 9 | ||||
| -rw-r--r-- | src/com/isode/stroke/session/Session.java | 5 | ||||
| -rw-r--r-- | src/com/isode/stroke/session/SessionTracer.java | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/com/isode/stroke/session/BasicSessionStream.java b/src/com/isode/stroke/session/BasicSessionStream.java index f1e7bf1..4f0e75b 100644 --- a/src/com/isode/stroke/session/BasicSessionStream.java +++ b/src/com/isode/stroke/session/BasicSessionStream.java @@ -10,6 +10,7 @@ package com.isode.stroke.session; import java.util.List; import com.isode.stroke.base.ByteArray; +import com.isode.stroke.base.SafeByteArray; import com.isode.stroke.elements.Element; import com.isode.stroke.elements.ProtocolHeader; import com.isode.stroke.elements.StreamType; @@ -71,15 +72,15 @@ public class BasicSessionStream extends SessionStream { handleXMPPError(); } }); - xmppLayer.onDataRead.connect(new Slot1<ByteArray>() { + xmppLayer.onDataRead.connect(new Slot1<SafeByteArray>() { - public void call(ByteArray p1) { + public void call(SafeByteArray p1) { handleDataRead(p1); } }); - xmppLayer.onWriteData.connect(new Slot1<ByteArray>() { + xmppLayer.onWriteData.connect(new Slot1<SafeByteArray>() { - public void call(ByteArray p1) { + public void call(SafeByteArray p1) { handleDataWritten(p1); } }); diff --git a/src/com/isode/stroke/session/Session.java b/src/com/isode/stroke/session/Session.java index eb64051..815be02 100644 --- a/src/com/isode/stroke/session/Session.java +++ b/src/com/isode/stroke/session/Session.java @@ -10,6 +10,7 @@ package com.isode.stroke.session; import com.isode.stroke.base.ByteArray; +import com.isode.stroke.base.SafeByteArray; import com.isode.stroke.elements.Element; import com.isode.stroke.elements.ProtocolHeader; import com.isode.stroke.elements.StreamType; @@ -81,8 +82,8 @@ public abstract class Session { } public final Signal1<Element> onElementReceived = new Signal1<Element>(); public final Signal1<SessionError> onSessionFinished = new Signal1<SessionError>(); - public final Signal1<ByteArray> onDataWritten = new Signal1<ByteArray>(); - public final Signal1<ByteArray> onDataRead = new Signal1<ByteArray>(); + public final Signal1<SafeByteArray> onDataWritten = new Signal1<SafeByteArray>(); + public final Signal1<SafeByteArray> onDataRead = new Signal1<SafeByteArray>(); protected void setRemoteJID(JID j) { remoteJID = j; diff --git a/src/com/isode/stroke/session/SessionTracer.java b/src/com/isode/stroke/session/SessionTracer.java index 7db165d..8b878a8 100644 --- a/src/com/isode/stroke/session/SessionTracer.java +++ b/src/com/isode/stroke/session/SessionTracer.java @@ -9,29 +9,29 @@ */ package com.isode.stroke.session; -import com.isode.stroke.base.ByteArray; +import com.isode.stroke.base.SafeByteArray; import com.isode.stroke.signals.Slot1; public class SessionTracer { public SessionTracer(Session session) { this.session = session; - session.onDataRead.connect(new Slot1<ByteArray>() { + session.onDataRead.connect(new Slot1<SafeByteArray>() { - public void call(ByteArray p1) { + public void call(SafeByteArray p1) { printData('<', p1); } }); - session.onDataWritten.connect(new Slot1<ByteArray>() { + session.onDataWritten.connect(new Slot1<SafeByteArray>() { - public void call(ByteArray p1) { + public void call(SafeByteArray p1) { printData('>', p1); } }); } - private void printData(char direction, ByteArray data) { + private void printData(char direction, SafeByteArray data) { System.err.print("" + direction + direction + " " + session.getLocalJID().toString() + " "); for (int i = 0; i < 72 - session.getLocalJID().toString().length() - session.getRemoteJID().toString().length(); ++i) { System.err.print(direction); |