Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Avoid some unnecessary session parsing.

Browse Source
This commit is contained in:
akwizgran
2018-10-31 16:18:33 +00:00
parent 3fe7aae97e
commit d3f774f339
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java
View File

@@ -422,7 +422,7 @@ class IntroductionManagerImpl extends ConversationClientImpl
MessageType type = meta.getMessageType(); MessageType type = meta.getMessageType();
if (type == REQUEST) { if (type == REQUEST) {
messages.add(parseInvitationRequest(txn, contactGroupId, m, messages.add(parseInvitationRequest(txn, contactGroupId, m,
meta, status, ss.bdfSession, authorInfos)); meta, status, meta.getSessionId(), authorInfos));
} else if (type == ACCEPT) { } else if (type == ACCEPT) {
messages.add(parseInvitationResponse(txn, contactGroupId, m, messages.add(parseInvitationResponse(txn, contactGroupId, m,
meta, status, ss.bdfSession, authorInfos, true)); meta, status, ss.bdfSession, authorInfos, true));
@@ -439,20 +439,9 @@ class IntroductionManagerImpl extends ConversationClientImpl
private IntroductionRequest parseInvitationRequest(Transaction txn, private IntroductionRequest parseInvitationRequest(Transaction txn,
GroupId contactGroupId, MessageId m, MessageMetadata meta, GroupId contactGroupId, MessageId m, MessageMetadata meta,
MessageStatus status, BdfDictionary bdfSession, MessageStatus status, SessionId sessionId,
Map<AuthorId, AuthorInfo> authorInfos) Map<AuthorId, AuthorInfo> authorInfos)
throws DbException, FormatException { throws DbException, FormatException {
Role role = sessionParser.getRole(bdfSession);
SessionId sessionId;
if (role == INTRODUCER) {
IntroducerSession session =
sessionParser.parseIntroducerSession(bdfSession);
sessionId = session.getSessionId();
} else if (role == INTRODUCEE) {
IntroduceeSession session = sessionParser
.parseIntroduceeSession(contactGroupId, bdfSession);
sessionId = session.getSessionId();
} else throw new AssertionError();
Message msg = clientHelper.getMessage(txn, m); Message msg = clientHelper.getMessage(txn, m);
BdfList body = clientHelper.toList(msg); BdfList body = clientHelper.toList(msg);
RequestMessage rm = messageParser.parseRequestMessage(msg, body); RequestMessage rm = messageParser.parseRequestMessage(msg, body);