From 043662a09247d2490ceb5457da66c870dcc46361 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 7 Nov 2018 18:31:07 +0000 Subject: [PATCH] Code cleanup. --- .../briarproject/bramble/sync/SimplexOutgoingSession.java | 8 ++++---- .../briar/introduction/IntroductionIntegrationTest.java | 5 ++--- .../invitation/GroupInvitationIntegrationTest.java | 1 - .../briar/sharing/ForumSharingIntegrationTest.java | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java index 52b86bf72..ecc7c26bb 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java @@ -132,8 +132,8 @@ class SimplexOutgoingSession implements SyncSession, EventListener { db.generateAck(txn, contactId, MAX_MESSAGE_IDS)); if (LOG.isLoggable(INFO)) LOG.info("Generated ack: " + (a != null)); - if (a != null) writerTasks.add(new WriteAck(a)); - else decrementOutstandingQueries(); + if (a == null) decrementOutstandingQueries(); + else writerTasks.add(new WriteAck(a)); } catch (DbException e) { logException(LOG, WARNING, e); interrupt(); @@ -172,8 +172,8 @@ class SimplexOutgoingSession implements SyncSession, EventListener { MAX_RECORD_PAYLOAD_BYTES, maxLatency)); if (LOG.isLoggable(INFO)) LOG.info("Generated batch: " + (b != null)); - if (b != null) writerTasks.add(new WriteBatch(b)); - else decrementOutstandingQueries(); + if (b == null) decrementOutstandingQueries(); + else writerTasks.add(new WriteBatch(b)); } catch (DbException e) { logException(LOG, WARNING, e); interrupt(); diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index 0670669cd..c3a4d3342 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -32,7 +32,6 @@ import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent; import org.briarproject.briar.api.introduction.event.IntroductionResponseReceivedEvent; import org.briarproject.briar.api.introduction.event.IntroductionSucceededEvent; -import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.test.BriarIntegrationTest; import org.junit.Before; import org.junit.Test; @@ -1101,8 +1100,8 @@ public class IntroductionIntegrationTest private void assertDefaultUiMessages() throws DbException { Collection messages = - db0.transactionWithResult(true, txn -> - introductionManager0.getMessageHeaders(txn, contactId1From0)); + db0.transactionWithResult(true, txn -> introductionManager0 + .getMessageHeaders(txn, contactId1From0)); assertEquals(2, messages.size()); assertMessagesAreAcked(messages); diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java index bde0152c8..033b90304 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.client.ProtocolStateException; import org.briarproject.briar.api.conversation.ConversationMessageHeader; -import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.privategroup.GroupMessage; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupManager; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java index a58d33acf..8921f3bfa 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java @@ -22,7 +22,6 @@ import org.briarproject.briar.api.forum.ForumPostHeader; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent; import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; -import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.sharing.SharingInvitationItem; import org.briarproject.briar.test.BriarIntegrationTest; import org.briarproject.briar.test.BriarIntegrationTestComponent;