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

Merge branch '768-keyagreementconnector-regression-unsupportedoperationexception' into 'master'

Browse Source 
Fix KeyAgreement after regression

Closes #768

See merge request !427
This commit is contained in:
akwizgran
2016-11-21 12:34:33 +00:00
parent 4eec29a631 b0098fb054
commit 988c3e4b58
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/org/briarproject/keyagreement/PayloadParserImpl.java
View File

@@ -10,7 +10,7 @@ import org.briarproject.api.keyagreement.PayloadParser;
import org.briarproject.api.keyagreement.TransportDescriptor; import org.briarproject.api.keyagreement.TransportDescriptor;
import org.briarproject.api.nullsafety.NotNullByDefault; import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.plugins.BluetoothConstants; import org.briarproject.api.plugins.BluetoothConstants;
import org.briarproject.api.plugins.TorConstants; import org.briarproject.api.plugins.LanTcpConstants;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@@ -60,7 +60,7 @@ class PayloadParserImpl implements PayloadParser {
TransportId id = BluetoothConstants.ID; TransportId id = BluetoothConstants.ID;
recognised.add(new TransportDescriptor(id, descriptor)); recognised.add(new TransportDescriptor(id, descriptor));
} else if (transportId == TRANSPORT_ID_LAN) { } else if (transportId == TRANSPORT_ID_LAN) {
TransportId id = TorConstants.ID; TransportId id = LanTcpConstants.ID;
recognised.add(new TransportDescriptor(id, descriptor)); recognised.add(new TransportDescriptor(id, descriptor));
} }
} }