From db3226794d0fe2c08fe92219089eb430b1a3aa88 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 4 May 2016 17:00:40 -0300
Subject: [PATCH] Remove unused clock from `BdfIncomingMessageHook`
---
.../org/briarproject/clients/BdfIncomingMessageHook.java | 2 +-
.../introduction/IntroductionManagerImpl.java | 8 +++-----
.../introduction/IntroductionManagerImplTest.java | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java b/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java
index 5380652c6d..e8d0b5e2f7 100644
--- a/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java
+++ b/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java
@@ -24,7 +24,7 @@ public abstract class BdfIncomingMessageHook implements IncomingMessageHook,
protected final MetadataParser metadataParser;
protected BdfIncomingMessageHook(ClientHelper clientHelper,
- MetadataParser metadataParser, Clock clock) {
+ MetadataParser metadataParser) {
this.clientHelper = clientHelper;
this.metadataParser = metadataParser;
}
diff --git a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java
index 97740b10ac..e5f918171b 100644
--- a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java
+++ b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java
@@ -3,6 +3,7 @@ package org.briarproject.introduction;
import org.briarproject.api.FormatException;
import org.briarproject.api.clients.Client;
import org.briarproject.api.clients.ClientHelper;
+import org.briarproject.api.clients.SessionId;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.contact.ContactManager.AddContactHook;
@@ -20,14 +21,12 @@ import org.briarproject.api.introduction.IntroductionManager;
import org.briarproject.api.introduction.IntroductionMessage;
import org.briarproject.api.introduction.IntroductionRequest;
import org.briarproject.api.introduction.IntroductionResponse;
-import org.briarproject.api.clients.SessionId;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.briarproject.api.sync.MessageStatus;
-import org.briarproject.api.system.Clock;
import org.briarproject.clients.BdfIncomingMessageHook;
import org.briarproject.util.StringUtils;
@@ -93,12 +92,11 @@ class IntroductionManagerImpl extends BdfIncomingMessageHook
@Inject
IntroductionManagerImpl(DatabaseComponent db, ClientHelper clientHelper,
- MetadataParser metadataParser, Clock clock,
- IntroducerManager introducerManager,
+ MetadataParser metadataParser, IntroducerManager introducerManager,
IntroduceeManager introduceeManager,
IntroductionGroupFactory introductionGroupFactory) {
- super(clientHelper, metadataParser, clock);
+ super(clientHelper, metadataParser);
this.db = db;
this.introducerManager = introducerManager;
this.introduceeManager = introduceeManager;
diff --git a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java
index fac0b0b32d..2b3bde49fb 100644
--- a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java
+++ b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java
@@ -118,7 +118,7 @@ public class IntroductionManagerImplTest extends BriarTestCase {
clock = context.mock(Clock.class);
introductionManager = new IntroductionManagerImpl(
- db, clientHelper, metadataParser, clock, introducerManager,
+ db, clientHelper, metadataParser, introducerManager,
introduceeManager, introductionGroupFactory
);
}
--
GitLab