Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Catch NPE when getting socket input/output streams.

Browse Source 
Works around a bug in Android 7, fixed in 7.1.
This commit is contained in:
akwizgran
2017-09-18 15:47:12 +01:00
parent eb6561b93d
commit 27422ab9f9
6 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.bramble.plugin.tor;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.plugin.Plugin;
import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
import org.briarproject.bramble.util.IoUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -21,12 +22,12 @@ class TorTransportConnection extends AbstractDuplexTransportConnection {
@Override
protected InputStream getInputStream() throws IOException {
return socket.getInputStream();
return IoUtils.getInputStream(socket);
}
@Override
protected OutputStream getOutputStream() throws IOException {
return socket.getOutputStream();
return IoUtils.getOutputStream(socket);
}
@Override