narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

less noisy logcat. catch illegal state exception as result of race condition

Browse source
This commit is contained in:
Daniel Gultsch 2024-01-19 15:20:47 +01:00
parent b2e1f9b3d8
commit 4168bc4666
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
View file

@ -191,7 +191,6 @@ public class WebRTCDataChannelTransport implements Transport {
new OnMessageObserver() { new OnMessageObserver() {
@Override @Override
public void onMessage(final DataChannel.Buffer buffer) { public void onMessage(final DataChannel.Buffer buffer) {
Log.d(Config.LOGTAG, "onMessage() (the other one)");
try { try {
WebRTCDataChannelTransport.this.writableByteChannel.write(buffer.data); WebRTCDataChannelTransport.this.writableByteChannel.write(buffer.data);
} catch (final IOException e) { } catch (final IOException e) {
@ -584,8 +583,7 @@ public class WebRTCDataChannelTransport implements Transport {
Log.d(Config.LOGTAG, "DataChannelWriter reached EOF"); Log.d(Config.LOGTAG, "DataChannelWriter reached EOF");
return; return;
} }
dataChannel.send( send(ByteBuffer.wrap(buffer, 0, count));
new DataChannel.Buffer(ByteBuffer.wrap(buffer, 0, count), true));
} }
} catch (final InterruptedException | InterruptedIOException e) { } catch (final InterruptedException | InterruptedIOException e) {
if (isSending.get()) { if (isSending.get()) {
@ -598,6 +596,16 @@ public class WebRTCDataChannelTransport implements Transport {
} }
} }
private void send(final ByteBuffer byteBuffer) throws IOException {
try {
dataChannel.send(new DataChannel.Buffer(byteBuffer, true));
} catch (final IllegalStateException e) {
// dataChannel can be 'disposed' if we waited too long between `isSending` check and
// actually trying to send
throw new IOException(e);
}
}
public void close() { public void close() {
this.isSending.set(false); this.isSending.set(false);
terminate(this.dataChannel); terminate(this.dataChannel);