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

Split onError() into two methods.

Browse Source
This commit is contained in:
akwizgran
2022-06-04 12:59:40 +01:00
parent b128220be3
commit e112f69c4e
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java
View File

@@ -20,7 +20,6 @@ import java.io.IOException;
import javax.annotation.Nullable;
import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault
@@ -51,7 +50,7 @@ class IncomingSimplexSyncConnection extends SyncConnection implements Runnable {
@Override
public void run() {
// Read and recognise the tag
byte[] tag = null;
byte[] tag;
StreamContext ctx;
try {
tag = readTag(reader.getInputStream());
@@ -63,24 +62,24 @@ class IncomingSimplexSyncConnection extends SyncConnection implements Runnable {
}
} catch (IOException | DbException e) {
logException(LOG, WARNING, e);
onError(false, tag);
onError();
return;
}
if (ctx == null) {
LOG.info("Unrecognised tag");
onError(false, tag);
onError();
return;
}
ContactId contactId = ctx.getContactId();
if (contactId == null) {
LOG.warning("Received rendezvous stream, expected contact");
onError(true, tag);
onError(tag);
return;
}
if (ctx.isHandshakeMode()) {
// TODO: Support handshake mode for contacts
LOG.warning("Received handshake tag, expected rotation mode");
onError(true, tag);
onError(tag);
return;
}
try {
@@ -94,15 +93,17 @@ class IncomingSimplexSyncConnection extends SyncConnection implements Runnable {
reader.dispose(false, true);
} catch (IOException e) {
logException(LOG, WARNING, e);
onError(true, tag);
onError(tag);
}
}
private void onError(boolean recognised, @Nullable byte[] tag) {
if (recognised) {
markTagAsRecognisedIfRequired(true, requireNonNull(tag));
}
disposeOnError(reader, recognised);
private void onError() {
disposeOnError(reader, false);
}
private void onError(byte[] tag) {
markTagAsRecognisedIfRequired(true, tag);
disposeOnError(reader, true);
}
private void markTagAsRecognisedIfRequired(boolean exception, byte[] tag) {