Add recently connected state to core and UI.

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -9,7 +9,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
@@ -31,7 +30,6 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
@@ -78,13 +76,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private volatile BluetoothAdapter adapter = null;
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
-			TimeoutMonitor timeoutMonitor, Executor ioExecutor,
-			ScheduledExecutorService scheduler, SecureRandom secureRandom,
-			AndroidExecutor androidExecutor, Context appContext, Clock clock,
-			Backoff backoff, PluginCallback callback, int maxLatency,
-			int maxIdleTime) {
-		super(connectionLimiter, timeoutMonitor, ioExecutor, scheduler,
-				secureRandom, backoff, callback, maxLatency, maxIdleTime);
+			Executor ioExecutor, AndroidExecutor androidExecutor,
+			Context appContext, SecureRandom secureRandom, Clock clock,
+			Backoff backoff, PluginCallback callback, int maxLatency) {
+		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
+				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.clock = clock;
@@ -176,10 +172,9 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 		return wrapSocket(ss.accept());
 	}
 
-	private DuplexTransportConnection wrapSocket(BluetoothSocket s)
-			throws IOException {
-		return new AndroidBluetoothTransportConnection(this, connectionLimiter,
-				timeoutMonitor, s);
+	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
+		return new AndroidBluetoothTransportConnection(this,
+				connectionLimiter, s);
 	}
 
 	@Override

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java

@@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.bluetooth;
 import android.content.Context;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
@@ -16,7 +15,6 @@ import org.briarproject.bramble.api.system.Clock;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -27,34 +25,28 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
 public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
-	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
 	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
 	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
 	private final Clock clock;
-	private final TimeoutMonitor timeoutMonitor;
 	private final BackoffFactory backoffFactory;
 
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
-			ScheduledExecutorService scheduler, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, EventBus eventBus,
-			Clock clock, TimeoutMonitor timeoutMonitor,
+			AndroidExecutor androidExecutor, Context appContext,
+			SecureRandom secureRandom, EventBus eventBus, Clock clock,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
-		this.scheduler = scheduler;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.clock = clock;
-		this.timeoutMonitor = timeoutMonitor;
 		this.backoffFactory = backoffFactory;
 	}
 
@@ -75,9 +67,8 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
-				connectionLimiter, timeoutMonitor, ioExecutor, scheduler,
-				secureRandom, androidExecutor, appContext, clock, backoff,
-				callback, MAX_LATENCY, MAX_IDLE_TIME);
+				connectionLimiter, ioExecutor, androidExecutor, appContext,
+				secureRandom, clock, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.bluetooth;
 
 import android.bluetooth.BluetoothSocket;
 
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
@@ -18,26 +17,22 @@ import static org.briarproject.bramble.util.AndroidUtils.isValidBluetoothAddress
 class AndroidBluetoothTransportConnection
 		extends AbstractDuplexTransportConnection {
 
-	private final BluetoothConnectionLimiter connectionLimiter;
+	private final BluetoothConnectionLimiter connectionManager;
 	private final BluetoothSocket socket;
-	private final InputStream in;
 
 	AndroidBluetoothTransportConnection(Plugin plugin,
-			BluetoothConnectionLimiter connectionLimiter,
-			TimeoutMonitor timeoutMonitor, BluetoothSocket socket)
-			throws IOException {
+			BluetoothConnectionLimiter connectionManager,
+			BluetoothSocket socket) {
 		super(plugin);
-		this.connectionLimiter = connectionLimiter;
+		this.connectionManager = connectionManager;
 		this.socket = socket;
-		in = timeoutMonitor.createTimeoutInputStream(
-				socket.getInputStream(), plugin.getMaxIdleTime() * 2);
 		String address = socket.getRemoteDevice().getAddress();
 		if (isValidBluetoothAddress(address)) remote.put(PROP_ADDRESS, address);
 	}
 
 	@Override
-	protected InputStream getInputStream() {
-		return in;
+	protected InputStream getInputStream() throws IOException {
+		return socket.getInputStream();
 	}
 
 	@Override
@@ -50,7 +45,7 @@ class AndroidBluetoothTransportConnection
 		try {
 			socket.close();
 		} finally {
-			connectionLimiter.connectionClosed(this);
+			connectionManager.connectionClosed(this);
 		}
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/io/TimeoutMonitor.java

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.io;
-
-import java.io.InputStream;
-
-public interface TimeoutMonitor {
-
-	/**
-	 * Returns an {@link InputStream} that wraps the given stream and allows
-	 * read timeouts to be detected.
-	 *
-	 * @param timeoutMs The read timeout in milliseconds. Timeouts will be
-	 * detected eventually but are not guaranteed to be detected immediately.
-	 */
-	InputStream createTimeoutInputStream(InputStream in, long timeoutMs);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionRegistry.java

@@ -5,8 +5,7 @@ import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
 import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
 
@@ -21,15 +20,15 @@ public interface ConnectionRegistry {
 	/**
 	 * Registers a connection with the given contact over the given transport.
 	 * Broadcasts {@link ConnectionOpenedEvent}. Also broadcasts
-	 * {@link ContactConnectedEvent} if this is the only connection with the
-	 * contact.
+	 * {@link ConnectionStatusChangedEvent} if this is the only connection with
+	 * the contact.
 	 */
 	void registerConnection(ContactId c, TransportId t, boolean incoming);
 
 	/**
 	 * Unregisters a connection with the given contact over the given transport.
 	 * Broadcasts {@link ConnectionClosedEvent}. Also broadcasts
-	 * {@link ContactDisconnectedEvent} if this is the only connection with
+	 * {@link ConnectionStatusChangedEvent} if this is the only connection with
 	 * the contact.
 	 */
 	void unregisterConnection(ContactId c, TransportId t, boolean incoming);
@@ -45,9 +44,9 @@ public interface ConnectionRegistry {
 	boolean isConnected(ContactId c, TransportId t);
 
 	/**
-	 * Returns true if the given contact is connected via any transport.
+	 * Returns the connection status of the given contact via all transports.
 	 */
-	boolean isConnected(ContactId c);
+	ConnectionStatus getConnectionStatus(ContactId c);
 
 	/**
 	 * Registers a connection with the given pending contact. Broadcasts

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionStatus.java

@@ -0,0 +1,5 @@
+package org.briarproject.bramble.api.plugin;
+
+public enum ConnectionStatus {
+	CONNECTED, RECENTLY_CONNECTED, DISCONNECTED
+}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionStatusChangedEvent.java

@@ -3,24 +3,31 @@ package org.briarproject.bramble.api.plugin.event;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 
 import javax.annotation.concurrent.Immutable;
 
 /**
- * An event that is broadcast when a contact connects that was not previously
- * connected via any transport.
+ * An event that is broadcast when a contact's connection status changes.
  */
 @Immutable
 @NotNullByDefault
-public class ContactConnectedEvent extends Event {
+public class ConnectionStatusChangedEvent extends Event {
 
 	private final ContactId contactId;
+	private final ConnectionStatus status;
 
-	public ContactConnectedEvent(ContactId contactId) {
+	public ConnectionStatusChangedEvent(ContactId contactId,
+			ConnectionStatus status) {
 		this.contactId = contactId;
+		this.status = status;
 	}
 
 	public ContactId getContactId() {
 		return contactId;
 	}
+
+	public ConnectionStatus getConnectionStatus() {
+		return status;
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactDisconnectedEvent.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.plugin.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact disconnects and is no longer
- * connected via any transport.
- */
-@Immutable
-@NotNullByDefault
-public class ContactDisconnectedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public ContactDisconnectedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/system/Clock.java

@@ -11,11 +11,6 @@ public interface Clock {
 	 */
 	long currentTimeMillis();
 
-	/**
-	 * @see System#nanoTime()
-	 */
-	long nanoTime();
-
 	/**
 	 * @see Thread#sleep(long)
 	 */

bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java

@@ -16,11 +16,6 @@ public class ArrayClock implements Clock {
 		return times[index++];
 	}
 
-	@Override
-	public long nanoTime() {
-		return times[index++] * 1_000_000;
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);

bramble-api/src/test/java/org/briarproject/bramble/test/SettableClock.java

@@ -17,11 +17,6 @@ public class SettableClock implements Clock {
 		return time.get();
 	}
 
-	@Override
-	public long nanoTime() {
-		return time.get() * 1_000_000;
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java

@@ -9,7 +9,6 @@ import org.briarproject.bramble.db.DatabaseExecutorModule;
 import org.briarproject.bramble.db.DatabaseModule;
 import org.briarproject.bramble.event.EventModule;
 import org.briarproject.bramble.identity.IdentityModule;
-import org.briarproject.bramble.io.IoModule;
 import org.briarproject.bramble.keyagreement.KeyAgreementModule;
 import org.briarproject.bramble.lifecycle.LifecycleModule;
 import org.briarproject.bramble.plugin.PluginModule;
@@ -36,7 +35,6 @@ import dagger.Module;
 		DatabaseExecutorModule.class,
 		EventModule.class,
 		IdentityModule.class,
-		IoModule.class,
 		KeyAgreementModule.class,
 		LifecycleModule.class,
 		PluginModule.class,

bramble-core/src/main/java/org/briarproject/bramble/io/IoModule.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.io;
-
-import org.briarproject.bramble.api.io.TimeoutMonitor;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class IoModule {
-
-	@Provides
-	@Singleton
-	TimeoutMonitor provideTimeoutMonitor(TimeoutMonitorImpl timeoutMonitor) {
-		return timeoutMonitor;
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java

@@ -1,104 +0,0 @@
-package org.briarproject.bramble.io;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.annotation.concurrent.GuardedBy;
-
-@NotNullByDefault
-class TimeoutInputStream extends InputStream {
-
-	private final Clock clock;
-	private final InputStream in;
-	private final long timeoutNs;
-	private final CloseListener listener;
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private long readStartedNs = -1;
-
-	TimeoutInputStream(Clock clock, InputStream in, long timeoutNs,
-			CloseListener listener) {
-		this.clock = clock;
-		this.in = in;
-		this.timeoutNs = timeoutNs;
-		this.listener = listener;
-	}
-
-	@Override
-	public int read() throws IOException {
-		synchronized (lock) {
-			readStartedNs = clock.nanoTime();
-		}
-		int input = in.read();
-		synchronized (lock) {
-			readStartedNs = -1;
-		}
-		return input;
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		synchronized (lock) {
-			readStartedNs = clock.nanoTime();
-		}
-		int read = in.read(b, off, len);
-		synchronized (lock) {
-			readStartedNs = -1;
-		}
-		return read;
-	}
-
-	@Override
-	public void close() throws IOException {
-		try {
-			in.close();
-		} finally {
-			listener.onClose(this);
-		}
-	}
-
-	@Override
-	public int available() throws IOException {
-		return in.available();
-	}
-
-	@Override
-	public void mark(int readlimit) {
-		in.mark(readlimit);
-	}
-
-	@Override
-	public boolean markSupported() {
-		return in.markSupported();
-	}
-
-	@Override
-	public void reset() throws IOException {
-		in.reset();
-	}
-
-	@Override
-	public long skip(long n) throws IOException {
-		return in.skip(n);
-	}
-
-	boolean hasTimedOut() {
-		synchronized (lock) {
-			return readStartedNs != -1 &&
-					clock.nanoTime() - readStartedNs > timeoutNs;
-		}
-	}
-
-	interface CloseListener {
-
-		void onClose(TimeoutInputStream closed);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java

@@ -1,96 +0,0 @@
-package org.briarproject.bramble.io;
-
-import org.briarproject.bramble.api.io.TimeoutMonitor;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-class TimeoutMonitorImpl implements TimeoutMonitor {
-
-	private static final Logger LOG =
-			getLogger(TimeoutMonitorImpl.class.getName());
-
-	private static final long CHECK_INTERVAL_MS = SECONDS.toMillis(10);
-
-	private final ScheduledExecutorService scheduler;
-	private final Executor ioExecutor;
-	private final Clock clock;
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private final List<TimeoutInputStream> streams = new ArrayList<>();
-
-	@GuardedBy("lock")
-	private Future<?> task = null;
-
-	@Inject
-	TimeoutMonitorImpl(@Scheduler ScheduledExecutorService scheduler,
-			@IoExecutor Executor ioExecutor, Clock clock) {
-		this.scheduler = scheduler;
-		this.ioExecutor = ioExecutor;
-		this.clock = clock;
-	}
-
-	@Override
-	public InputStream createTimeoutInputStream(InputStream in,
-			long timeoutMs) {
-		TimeoutInputStream stream = new TimeoutInputStream(clock, in,
-				timeoutMs * 1_000_000, this::removeStream);
-		synchronized (lock) {
-			if (streams.isEmpty()) {
-				task = scheduler.scheduleWithFixedDelay(this::checkTimeouts,
-						CHECK_INTERVAL_MS, CHECK_INTERVAL_MS, MILLISECONDS);
-			}
-			streams.add(stream);
-		}
-		return stream;
-	}
-
-	private void removeStream(TimeoutInputStream stream) {
-		Future<?> toCancel = null;
-		synchronized (lock) {
-			if (streams.remove(stream) && streams.isEmpty()) {
-				toCancel = task;
-				task = null;
-			}
-		}
-		if (toCancel != null) toCancel.cancel(false);
-	}
-
-	@Scheduler
-	private void checkTimeouts() {
-		ioExecutor.execute(() -> {
-			List<TimeoutInputStream> snapshot;
-			synchronized (lock) {
-				snapshot = new ArrayList<>(streams);
-			}
-			for (TimeoutInputStream stream : snapshot) {
-				if (stream.hasTimedOut()) {
-					LOG.info("Input stream has timed out");
-					try {
-						stream.close();
-					} catch (IOException e) {
-						logException(LOG, INFO, e);
-					}
-				}
-			}
-		});
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionRegistryImpl.java

@@ -6,30 +6,41 @@ import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
 import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.Scheduler;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
+import static java.util.Collections.emptyList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.CONNECTED;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.DISCONNECTED;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.RECENTLY_CONNECTED;
 
 @ThreadSafe
 @NotNullByDefault
@@ -38,22 +49,30 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 	private static final Logger LOG =
 			getLogger(ConnectionRegistryImpl.class.getName());
 
+	private static final long RECENTLY_CONNECTED_MS = MINUTES.toMillis(1);
+	private static final long EXPIRY_INTERVAL_MS = SECONDS.toMillis(10);
+
 	private final EventBus eventBus;
+	private final Clock clock;
 
 	private final Object lock = new Object();
 	@GuardedBy("lock")
 	private final Map<TransportId, Multiset<ContactId>> contactConnections;
 	@GuardedBy("lock")
-	private final Multiset<ContactId> contactCounts;
+	private final Map<ContactId, Counter> contactCounts;
 	@GuardedBy("lock")
 	private final Set<PendingContactId> connectedPendingContacts;
 
 	@Inject
-	ConnectionRegistryImpl(EventBus eventBus) {
+	ConnectionRegistryImpl(EventBus eventBus, Clock clock,
+			@Scheduler ScheduledExecutorService scheduler) {
 		this.eventBus = eventBus;
+		this.clock = clock;
 		contactConnections = new HashMap<>();
-		contactCounts = new Multiset<>();
+		contactCounts = new HashMap<>();
 		connectedPendingContacts = new HashSet<>();
+		scheduler.scheduleWithFixedDelay(this::expireRecentConnections,
+				EXPIRY_INTERVAL_MS, EXPIRY_INTERVAL_MS, MILLISECONDS);
 	}
 
 	@Override
@@ -71,12 +90,22 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 				contactConnections.put(t, m);
 			}
 			m.add(c);
-			if (contactCounts.add(c) == 1) firstConnection = true;
+
+			Counter counter = contactCounts.get(c);
+			if (counter == null) {
+				counter = new Counter();
+				contactCounts.put(c, counter);
+			}
+			if (counter.connections == 0) {
+				counter.disconnectedTime = 0;
+				firstConnection = true;
+			}
+			counter.connections++;
 		}
 		eventBus.broadcast(new ConnectionOpenedEvent(c, t, incoming));
 		if (firstConnection) {
 			LOG.info("Contact connected");
-			eventBus.broadcast(new ContactConnectedEvent(c));
+			eventBus.broadcast(new ConnectionStatusChangedEvent(c, CONNECTED));
 		}
 	}
 
@@ -93,12 +122,22 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 			if (m == null || !m.contains(c))
 				throw new IllegalArgumentException();
 			m.remove(c);
-			if (contactCounts.remove(c) == 0) lastConnection = true;
+
+			Counter counter = contactCounts.get(c);
+			if (counter == null || counter.connections == 0) {
+				throw new IllegalArgumentException();
+			}
+			counter.connections--;
+			if (counter.connections == 0) {
+				counter.disconnectedTime = clock.currentTimeMillis();
+				lastConnection = true;
+			}
 		}
 		eventBus.broadcast(new ConnectionClosedEvent(c, t, incoming));
 		if (lastConnection) {
 			LOG.info("Contact disconnected");
-			eventBus.broadcast(new ContactDisconnectedEvent(c));
+			eventBus.broadcast(
+					new ConnectionStatusChangedEvent(c, RECENTLY_CONNECTED));
 		}
 	}
 
@@ -106,7 +145,7 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 	public Collection<ContactId> getConnectedContacts(TransportId t) {
 		synchronized (lock) {
 			Multiset<ContactId> m = contactConnections.get(t);
-			if (m == null) return Collections.emptyList();
+			if (m == null) return emptyList();
 			List<ContactId> ids = new ArrayList<>(m.keySet());
 			if (LOG.isLoggable(INFO))
 				LOG.info(ids.size() + " contacts connected: " + t);
@@ -123,9 +162,11 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 	}
 
 	@Override
-	public boolean isConnected(ContactId c) {
+	public ConnectionStatus getConnectionStatus(ContactId c) {
 		synchronized (lock) {
-			return contactCounts.contains(c);
+			Counter counter = contactCounts.get(c);
+			if (counter == null) return DISCONNECTED;
+			return counter.connections > 0 ? CONNECTED : RECENTLY_CONNECTED;
 		}
 	}
 
@@ -147,4 +188,36 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 		}
 		eventBus.broadcast(new RendezvousConnectionClosedEvent(p, success));
 	}
+
+	@Scheduler
+	private void expireRecentConnections() {
+		long now = clock.currentTimeMillis();
+		List<ContactId> disconnected = new ArrayList<>();
+		synchronized (lock) {
+			Iterator<Entry<ContactId, Counter>> it =
+					contactCounts.entrySet().iterator();
+			while (it.hasNext()) {
+				Entry<ContactId, Counter> e = it.next();
+				if (e.getValue().isExpired(now)) {
+					disconnected.add(e.getKey());
+					it.remove();
+				}
+			}
+		}
+		for (ContactId c : disconnected) {
+			eventBus.broadcast(
+					new ConnectionStatusChangedEvent(c, DISCONNECTED));
+		}
+	}
+
+	private static class Counter {
+
+		private int connections = 0;
+		private long disconnectedTime = 0;
+
+		private boolean isExpired(long now) {
+			return connections == 0 &&
+					now - disconnectedTime > RECENTLY_CONNECTED_MS;
+		}
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
@@ -31,17 +30,13 @@ import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.UUID;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
@@ -64,22 +59,13 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	private static final Logger LOG =
 			getLogger(BluetoothPlugin.class.getName());
 
-	/**
-	 * The delay between connection attempts when polling. This reduces
-	 * interference between Bluetooth and wifi.
-	 */
-	private static final long CONNECTION_ATTEMPT_INTERVAL_MS =
-			SECONDS.toMillis(5);
-
 	final BluetoothConnectionLimiter connectionLimiter;
-	final TimeoutMonitor timeoutMonitor;
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
 	private final SecureRandom secureRandom;
 	private final Backoff backoff;
 	private final PluginCallback callback;
-	private final int maxLatency, maxIdleTime;
+	private final int maxLatency;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
 	private volatile boolean running = false, contactConnections = false;
@@ -119,19 +105,14 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	abstract DuplexTransportConnection discoverAndConnect(String uuid);
 
 	BluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
-			TimeoutMonitor timeoutMonitor, Executor ioExecutor,
-			ScheduledExecutorService scheduler, SecureRandom secureRandom,
-			Backoff backoff, PluginCallback callback, int maxLatency,
-			int maxIdleTime) {
+			Executor ioExecutor, SecureRandom secureRandom,
+			Backoff backoff, PluginCallback callback, int maxLatency) {
 		this.connectionLimiter = connectionLimiter;
-		this.timeoutMonitor = timeoutMonitor;
 		this.ioExecutor = ioExecutor;
-		this.scheduler = scheduler;
 		this.secureRandom = secureRandom;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.maxLatency = maxLatency;
-		this.maxIdleTime = maxIdleTime;
 	}
 
 	void onAdapterEnabled() {
@@ -160,7 +141,8 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 
 	@Override
 	public int getMaxIdleTime() {
-		return maxIdleTime;
+		// Bluetooth detects dead connections so we don't need keepalives
+		return Integer.MAX_VALUE;
 	}
 
 	@Override
@@ -245,11 +227,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 				if (LOG.isLoggable(INFO)) LOG.info(e.toString());
 				return;
 			}
-			LOG.info("Connection received");
-			if (connectionLimiter.contactConnectionOpened(conn)) {
-				backoff.reset();
+			backoff.reset();
+			if (connectionLimiter.contactConnectionOpened(conn))
 				callback.handleConnection(conn);
-			}
 			if (!running) return;
 		}
 	}
@@ -282,31 +262,24 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 			properties) {
 		if (!isRunning() || !shouldAllowContactConnections()) return;
 		backoff.increment();
-		LinkedList<Pair<TransportProperties, ConnectionHandler>> connectable =
-				new LinkedList<>();
-		for (Pair<TransportProperties, ConnectionHandler> pair : properties) {
-			TransportProperties p = pair.getFirst();
-			if (isNullOrEmpty(p.get(PROP_ADDRESS))) continue;
-			if (isNullOrEmpty(p.get(PROP_UUID))) continue;
-			connectable.add(pair);
+		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
+			connect(p.getFirst(), p.getSecond());
 		}
-		if (!connectable.isEmpty()) poll(connectable);
 	}
 
-	private void poll(LinkedList<Pair<TransportProperties, ConnectionHandler>>
-			connectable) {
+	private void connect(TransportProperties p, ConnectionHandler h) {
+		String address = p.get(PROP_ADDRESS);
+		if (isNullOrEmpty(address)) return;
+		String uuid = p.get(PROP_UUID);
+		if (isNullOrEmpty(uuid)) return;
 		ioExecutor.execute(() -> {
 			if (!isRunning() || !shouldAllowContactConnections()) return;
-			Pair<TransportProperties, ConnectionHandler> pair =
-					connectable.removeFirst();
-			DuplexTransportConnection d = createConnection(pair.getFirst());
+			if (!connectionLimiter.canOpenContactConnection()) return;
+			DuplexTransportConnection d = createConnection(p);
 			if (d != null) {
 				backoff.reset();
-				pair.getSecond().handleConnection(d);
-			}
-			if (!connectable.isEmpty()) {
-				scheduler.schedule(() -> poll(connectable),
-						CONNECTION_ATTEMPT_INTERVAL_MS, MILLISECONDS);
+				if (connectionLimiter.contactConnectionOpened(d))
+					h.handleConnection(d);
 			}
 		});
 	}
@@ -352,6 +325,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		if (isNullOrEmpty(uuid)) return null;
 		DuplexTransportConnection conn = connect(address, uuid);
 		if (conn == null) return null;
+		// TODO: Why don't we reset the backoff here?
 		return connectionLimiter.contactConnectionOpened(conn) ? conn : null;
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/system/SystemClock.java

@@ -12,11 +12,6 @@ public class SystemClock implements Clock {
 		return System.currentTimeMillis();
 	}
 
-	@Override
-	public long nanoTime() {
-		return System.nanoTime();
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);

bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java

@@ -2420,11 +2420,6 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 			return time;
 		}
 
-		@Override
-		public long nanoTime() {
-			return time * 1_000_000;
-		}
-
 		@Override
 		public void sleep(long milliseconds) throws InterruptedException {
 			Thread.sleep(milliseconds);

bramble-core/src/test/java/org/briarproject/bramble/io/TimeoutInputStreamTest.java

@@ -1,143 +0,0 @@
-package org.briarproject.bramble.io;
-
-import org.briarproject.bramble.test.BrambleTestCase;
-import org.briarproject.bramble.test.SettableClock;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class TimeoutInputStreamTest extends BrambleTestCase {
-
-	private static final long TIMEOUT_MS = MINUTES.toMillis(1);
-
-	private final long now = System.currentTimeMillis();
-
-	private AtomicLong time;
-	private UnresponsiveInputStream in;
-	private AtomicBoolean listenerCalled;
-	private TimeoutInputStream stream;
-	private CountDownLatch readReturned;
-
-	@Before
-	public void setUp() {
-		time = new AtomicLong(now);
-		in = new UnresponsiveInputStream();
-		listenerCalled = new AtomicBoolean(false);
-		stream = new TimeoutInputStream(new SettableClock(time), in,
-				TIMEOUT_MS * 1_000_000, stream -> listenerCalled.set(true));
-		readReturned = new CountDownLatch(1);
-	}
-
-	@Test
-	public void testTimeoutIsReportedIfReadDoesNotReturn() throws Exception {
-		startReading();
-		try {
-			// The stream should not report a timeout
-			assertFalse(stream.hasTimedOut());
-
-			// Time passes
-			time.set(now + TIMEOUT_MS);
-
-			// The stream still shouldn't report a timeout
-			assertFalse(stream.hasTimedOut());
-
-			// Time passes
-			time.set(now + TIMEOUT_MS + 1);
-
-			// The stream should report a timeout
-			assertTrue(stream.hasTimedOut());
-
-			// The listener should not have been called yet
-			assertFalse(listenerCalled.get());
-
-			// Close the stream
-			stream.close();
-
-			// The listener should have been called
-			assertTrue(listenerCalled.get());
-		} finally {
-			// Allow the read to return
-			in.readFinished.countDown();
-		}
-	}
-
-	@Test
-	public void testTimeoutIsNotReportedIfReadReturns() throws Exception {
-		startReading();
-		try {
-			// The stream should not report a timeout
-			assertFalse(stream.hasTimedOut());
-
-			// Time passes
-			time.set(now + TIMEOUT_MS);
-
-			// The stream still shouldn't report a timeout
-			assertFalse(stream.hasTimedOut());
-
-			// Allow the read to finish and wait for it to return
-			in.readFinished.countDown();
-			readReturned.await(10, SECONDS);
-
-			// Time passes
-			time.set(now + TIMEOUT_MS + 1);
-
-			// The stream should not report a timeout as the read has returned
-			assertFalse(stream.hasTimedOut());
-
-			// The listener should not have been called yet
-			assertFalse(listenerCalled.get());
-
-			// Close the stream
-			stream.close();
-
-			// The listener should have been called
-			assertTrue(listenerCalled.get());
-		} finally {
-			// Allow the read to return in case an assertion was thrown
-			in.readFinished.countDown();
-		}
-	}
-
-	private void startReading() throws Exception {
-		// Start a background thread to read from the unresponsive stream
-		new Thread(() -> {
-			try {
-				assertEquals(123, stream.read());
-				readReturned.countDown();
-			} catch (IOException e) {
-				fail();
-			}
-		}).start();
-		// Wait for the background thread to start reading
-		assertTrue(in.readStarted.await(10, SECONDS));
-	}
-
-	private class UnresponsiveInputStream extends InputStream {
-
-		private final CountDownLatch readStarted = new CountDownLatch(1);
-		private final CountDownLatch readFinished = new CountDownLatch(1);
-
-		@Override
-		public int read() throws IOException {
-			readStarted.countDown();
-			try {
-				readFinished.await();
-				return 123;
-			} catch (InterruptedException e) {
-				throw new IOException(e);
-			}
-		}
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java

@@ -7,18 +7,20 @@ import org.briarproject.bramble.api.plugin.ConnectionRegistry;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
 import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
+import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.jmock.Expectations;
 import org.junit.Test;
 
 import java.util.Collection;
+import java.util.concurrent.ScheduledExecutorService;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.briarproject.bramble.test.TestUtils.getContactId;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
@@ -30,6 +32,9 @@ import static org.junit.Assert.fail;
 public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 
 	private final EventBus eventBus = context.mock(EventBus.class);
+	private final Clock clock = context.mock(Clock.class);
+	private final ScheduledExecutorService scheduler =
+			context.mock(ScheduledExecutorService.class);
 
 	private final ContactId contactId = getContactId();
 	private final ContactId contactId1 = getContactId();
@@ -40,17 +45,25 @@ public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRegisterAndUnregister() {
-		ConnectionRegistry c = new ConnectionRegistryImpl(eventBus);
+		context.checking(new Expectations() {{
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
+					with(10_000L), with(10_000L), with(MILLISECONDS));
+		}});
+
+		ConnectionRegistry c = new ConnectionRegistryImpl(eventBus, clock,
+				scheduler);
+		context.assertIsSatisfied();
 
 		// The registry should be empty
 		assertEquals(emptyList(), c.getConnectedContacts(transportId));
 		assertEquals(emptyList(), c.getConnectedContacts(transportId1));
 
 		// Check that a registered connection shows up - this should
-		// broadcast a ConnectionOpenedEvent and a ContactConnectedEvent
+		// broadcast a ConnectionOpenedEvent and a ConnectionStatusChangedEvent
 		context.checking(new Expectations() {{
 			oneOf(eventBus).broadcast(with(any(ConnectionOpenedEvent.class)));
-			oneOf(eventBus).broadcast(with(any(ContactConnectedEvent.class)));
+			oneOf(eventBus).broadcast(with(any(
+					ConnectionStatusChangedEvent.class)));
 		}});
 		c.registerConnection(contactId, transportId, true);
 		assertEquals(singletonList(contactId),
@@ -81,11 +94,13 @@ public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 		context.assertIsSatisfied();
 
 		// Unregister the other connection - this should broadcast a
-		// ConnectionClosedEvent and a ContactDisconnectedEvent
+		// ConnectionClosedEvent and a ConnectionStatusChangedEvent
 		context.checking(new Expectations() {{
+			oneOf(clock).currentTimeMillis();
+			will(returnValue(System.currentTimeMillis()));
 			oneOf(eventBus).broadcast(with(any(ConnectionClosedEvent.class)));
 			oneOf(eventBus).broadcast(with(any(
-					ContactDisconnectedEvent.class)));
+					ConnectionStatusChangedEvent.class)));
 		}});
 		c.unregisterConnection(contactId, transportId, true);
 		assertEquals(emptyList(), c.getConnectedContacts(transportId));
@@ -102,12 +117,12 @@ public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 
 		// Register both contacts with one transport, one contact with both -
 		// this should broadcast three ConnectionOpenedEvents and two
-		// ContactConnectedEvents
+		// ConnectionStatusChangedEvents
 		context.checking(new Expectations() {{
 			exactly(3).of(eventBus).broadcast(with(any(
 					ConnectionOpenedEvent.class)));
 			exactly(2).of(eventBus).broadcast(with(any(
-					ContactConnectedEvent.class)));
+					ConnectionStatusChangedEvent.class)));
 		}});
 		c.registerConnection(contactId, transportId, true);
 		c.registerConnection(contactId1, transportId, true);
@@ -122,7 +137,14 @@ public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRegisterAndUnregisterPendingContacts() {
-		ConnectionRegistry c = new ConnectionRegistryImpl(eventBus);
+		context.checking(new Expectations() {{
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
+					with(10_000L), with(10_000L), with(MILLISECONDS));
+		}});
+
+		ConnectionRegistry c = new ConnectionRegistryImpl(eventBus, clock,
+				scheduler);
+		context.assertIsSatisfied();
 
 		context.checking(new Expectations() {{
 			oneOf(eventBus).broadcast(with(any(

bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.plugin;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.ShutdownManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -10,7 +9,6 @@ import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory;
-import org.briarproject.bramble.api.system.Scheduler;
 import org.briarproject.bramble.plugin.bluetooth.JavaBluetoothPluginFactory;
 import org.briarproject.bramble.plugin.modem.ModemPluginFactory;
 import org.briarproject.bramble.plugin.tcp.LanTcpPluginFactory;
@@ -19,7 +17,6 @@ import org.briarproject.bramble.plugin.tcp.WanTcpPluginFactory;
 import java.security.SecureRandom;
 import java.util.Collection;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 
 import dagger.Module;
 import dagger.Provides;
@@ -32,14 +29,12 @@ public class DesktopPluginModule extends PluginModule {
 
 	@Provides
 	PluginConfig getPluginConfig(@IoExecutor Executor ioExecutor,
-			@Scheduler ScheduledExecutorService scheduler,
 			SecureRandom random, BackoffFactory backoffFactory,
 			ReliabilityLayerFactory reliabilityFactory,
-			ShutdownManager shutdownManager, EventBus eventBus,
-			TimeoutMonitor timeoutMonitor) {
-		DuplexPluginFactory bluetooth = new JavaBluetoothPluginFactory(
-				ioExecutor, scheduler, random, eventBus, timeoutMonitor,
-				backoffFactory);
+			ShutdownManager shutdownManager, EventBus eventBus) {
+		DuplexPluginFactory bluetooth =
+				new JavaBluetoothPluginFactory(ioExecutor, random, eventBus,
+						backoffFactory);
 		DuplexPluginFactory modem = new ModemPluginFactory(ioExecutor,
 				reliabilityFactory);
 		DuplexPluginFactory lan = new LanTcpPluginFactory(ioExecutor,

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
@@ -10,7 +9,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
@@ -36,12 +34,10 @@ class JavaBluetoothPlugin extends BluetoothPlugin<StreamConnectionNotifier> {
 	private volatile LocalDevice localDevice = null;
 
 	JavaBluetoothPlugin(BluetoothConnectionLimiter connectionManager,
-			TimeoutMonitor timeoutMonitor, Executor ioExecutor,
-			ScheduledExecutorService scheduler, SecureRandom secureRandom,
-			Backoff backoff, PluginCallback callback, int maxLatency,
-			int maxIdleTime) {
-		super(connectionManager, timeoutMonitor, ioExecutor, scheduler,
-				secureRandom, backoff, callback, maxLatency, maxIdleTime);
+			Executor ioExecutor, SecureRandom secureRandom,
+			Backoff backoff, PluginCallback callback, int maxLatency) {
+		super(connectionManager, ioExecutor, secureRandom, backoff, callback,
+				maxLatency);
 	}
 
 	@Override
@@ -123,9 +119,7 @@ class JavaBluetoothPlugin extends BluetoothPlugin<StreamConnectionNotifier> {
 		return "btspp://" + address + ":" + uuid + ";name=RFCOMM";
 	}
 
-	private DuplexTransportConnection wrapSocket(StreamConnection s)
-			throws IOException {
-		return new JavaBluetoothTransportConnection(this, connectionLimiter,
-				timeoutMonitor, s);
+	private DuplexTransportConnection wrapSocket(StreamConnection s) {
+		return new JavaBluetoothTransportConnection(this, connectionLimiter, s);
 	}
 }

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
@@ -12,7 +11,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -23,28 +21,22 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
 public class JavaBluetoothPluginFactory implements DuplexPluginFactory {
 
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
-	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
 	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
 	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
 	private final SecureRandom secureRandom;
-	private final EventBus eventBus;
-	private final TimeoutMonitor timeoutMonitor;
 	private final BackoffFactory backoffFactory;
+	private final EventBus eventBus;
 
 	public JavaBluetoothPluginFactory(Executor ioExecutor,
-			ScheduledExecutorService scheduler, SecureRandom secureRandom,
-			EventBus eventBus, TimeoutMonitor timeoutMonitor,
+			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
-		this.scheduler = scheduler;
 		this.secureRandom = secureRandom;
-		this.eventBus = eventBus;
-		this.timeoutMonitor = timeoutMonitor;
 		this.backoffFactory = backoffFactory;
+		this.eventBus = eventBus;
 	}
 
 	@Override
@@ -64,8 +56,7 @@ public class JavaBluetoothPluginFactory implements DuplexPluginFactory {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		JavaBluetoothPlugin plugin = new JavaBluetoothPlugin(connectionLimiter,
-				timeoutMonitor, ioExecutor, scheduler, secureRandom, backoff,
-				callback, MAX_LATENCY, MAX_IDLE_TIME);
+				ioExecutor, secureRandom, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
@@ -15,24 +14,20 @@ import javax.microedition.io.StreamConnection;
 class JavaBluetoothTransportConnection
 		extends AbstractDuplexTransportConnection {
 
-	private final BluetoothConnectionLimiter connectionLimiter;
+	private final BluetoothConnectionLimiter connectionManager;
 	private final StreamConnection stream;
-	private final InputStream in;
 
 	JavaBluetoothTransportConnection(Plugin plugin,
-			BluetoothConnectionLimiter connectionLimiter,
-			TimeoutMonitor timeoutMonitor,
-			StreamConnection stream) throws IOException {
+			BluetoothConnectionLimiter connectionManager,
+			StreamConnection stream) {
 		super(plugin);
-		this.connectionLimiter = connectionLimiter;
 		this.stream = stream;
-		in = timeoutMonitor.createTimeoutInputStream(
-				stream.openInputStream(), plugin.getMaxIdleTime() * 2);
+		this.connectionManager = connectionManager;
 	}
 
 	@Override
-	protected InputStream getInputStream() {
-		return in;
+	protected InputStream getInputStream() throws IOException {
+		return stream.openInputStream();
 	}
 
 	@Override
@@ -45,7 +40,7 @@ class JavaBluetoothTransportConnection
 		try {
 			stream.close();
 		} finally {
-			connectionLimiter.connectionClosed(this);
+			connectionManager.connectionClosed(this);
 		}
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -14,7 +14,6 @@ import org.briarproject.bramble.api.crypto.KeyStrengthener;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.network.NetworkManager;
@@ -123,12 +122,11 @@ public class AppModule {
 			LocationUtils locationUtils, EventBus eventBus,
 			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Clock clock,
-			TimeoutMonitor timeoutMonitor) {
+			BatteryManager batteryManager, Clock clock) {
 		Context appContext = app.getApplicationContext();
-		DuplexPluginFactory bluetooth = new AndroidBluetoothPluginFactory(
-				ioExecutor, scheduler, androidExecutor, appContext, random,
-				eventBus, clock, timeoutMonitor, backoffFactory);
+		DuplexPluginFactory bluetooth =
+				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
+						appContext, random, eventBus, clock, backoffFactory);
 		DuplexPluginFactory tor = new AndroidTorPluginFactory(ioExecutor,
 				scheduler, appContext, networkManager, locationUtils, eventBus,
 				torSocketFactory, backoffFactory, resourceProvider,

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java

@@ -2,35 +2,38 @@ package org.briarproject.briar.android.contact;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.DISCONNECTED;
+
 @NotThreadSafe
 @NotNullByDefault
 public class ContactItem {
 
 	private final Contact contact;
-	private boolean connected;
+	private ConnectionStatus status;
 
 	public ContactItem(Contact contact) {
-		this(contact, false);
+		this(contact, DISCONNECTED);
 	}
 
-	public ContactItem(Contact contact, boolean connected) {
+	public ContactItem(Contact contact, ConnectionStatus status) {
 		this.contact = contact;
-		this.connected = connected;
+		this.status = status;
 	}
 
 	public Contact getContact() {
 		return contact;
 	}
 
-	boolean isConnected() {
-		return connected;
+	ConnectionStatus getConnectionStatus() {
+		return status;
 	}
 
-	void setConnected(boolean connected) {
-		this.connected = connected;
+	void setConnectionStatus(ConnectionStatus status) {
+		this.status = status;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java

@@ -7,6 +7,7 @@ import android.widget.TextView;
 
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 
@@ -16,6 +17,8 @@ import androidx.annotation.UiThread;
 import androidx.recyclerview.widget.RecyclerView;
 import im.delight.android.identicons.IdenticonDrawable;
 
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.CONNECTED;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.RECENTLY_CONNECTED;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
@@ -27,7 +30,7 @@ public class ContactItemViewHolder<I extends ContactItem>
 	protected final ImageView avatar;
 	protected final TextView name;
 	@Nullable
-	protected final ImageView bulb;
+	private final ImageView bulb;
 
 	public ContactItemViewHolder(View v) {
 		super(v);
@@ -47,10 +50,13 @@ public class ContactItemViewHolder<I extends ContactItem>
 
 		if (bulb != null) {
 			// online/offline
-			if (item.isConnected()) {
-				bulb.setImageResource(R.drawable.contact_connected);
+			ConnectionStatus status = item.getConnectionStatus();
+			if (status == CONNECTED) {
+				bulb.setImageResource(R.drawable.ic_connected);
+			} else if (status == RECENTLY_CONNECTED) {
+				bulb.setImageResource(R.drawable.ic_recently_connected);
 			} else {
-				bulb.setImageResource(R.drawable.contact_disconnected);
+				bulb.setImageResource(R.drawable.ic_disconnected);
 			}
 		}
 

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java

@@ -39,7 +39,7 @@ public class ContactListAdapter extends
 		if (c1.getTimestamp() != c2.getTimestamp()) {
 			return false;
 		}
-		return c1.isConnected() == c2.isConnected();
+		return c1.getConnectionStatus() == c2.getConnectionStatus();
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -25,8 +25,8 @@ import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
@@ -53,7 +53,6 @@ import javax.inject.Inject;
 import androidx.annotation.UiThread;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.util.Pair;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
@@ -137,26 +136,15 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 					ContactId contactId = item.getContact().getId();
 					i.putExtra(CONTACT_ID, contactId.getInt());
 
+					Bundle options = null;
+					// work-around for android bug #224270
 					if (SDK_INT >= 23 && !isSamsung7()) {
-						ContactListItemViewHolder holder =
-								(ContactListItemViewHolder) list
-										.getRecyclerView()
-										.findViewHolderForAdapterPosition(
-												adapter.findItemPosition(item));
-						Pair<View, String> avatar =
-								Pair.create(holder.avatar,
-										getTransitionName(holder.avatar));
-						Pair<View, String> bulb =
-								Pair.create(holder.bulb,
-										getTransitionName(holder.bulb));
-						ActivityOptionsCompat options =
-								makeSceneTransitionAnimation(getActivity(),
-										avatar, bulb);
-						ActivityCompat.startActivity(getActivity(), i,
-								options.toBundle());
-					} else {
-						// work-around for android bug #224270
+						options = makeTransitionOptions(view);
+					}
+					if (options == null) {
 						startActivity(i);
+					} else {
+						ActivityCompat.startActivity(getActivity(), i, options);
 					}
 				};
 		adapter = new ContactListAdapter(requireContext(),
@@ -171,6 +159,15 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		return contentView;
 	}
 
+	@Nullable
+	private Bundle makeTransitionOptions(View view) {
+		View avatar = view.findViewById(R.id.avatarView);
+		String name = requireNonNull(getTransitionName(avatar));
+		ActivityOptionsCompat options = makeSceneTransitionAnimation(
+				requireActivity(), view, name);
+		return options.toBundle();
+	}
+
 	@Override
 	public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
 			int itemId) {
@@ -232,9 +229,9 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 						ContactId id = c.getId();
 						GroupCount count =
 								conversationManager.getGroupCount(id);
-						boolean connected =
-								connectionRegistry.isConnected(c.getId());
-						contacts.add(new ContactListItem(c, connected, count));
+						ConnectionStatus status = connectionRegistry
+								.getConnectionStatus(c.getId());
+						contacts.add(new ContactListItem(c, status, count));
 					} catch (NoSuchContactException e) {
 						// Continue
 					}
@@ -265,10 +262,9 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		if (e instanceof ContactAddedEvent) {
 			LOG.info("Contact added, reloading");
 			loadContacts();
-		} else if (e instanceof ContactConnectedEvent) {
-			setConnected(((ContactConnectedEvent) e).getContactId(), true);
-		} else if (e instanceof ContactDisconnectedEvent) {
-			setConnected(((ContactDisconnectedEvent) e).getContactId(), false);
+		} else if (e instanceof ConnectionStatusChangedEvent) {
+			ConnectionStatusChangedEvent c = (ConnectionStatusChangedEvent) e;
+			setConnectionStatus(c.getContactId(), c.getConnectionStatus());
 		} else if (e instanceof ContactRemovedEvent) {
 			LOG.info("Contact removed, removing item");
 			removeItem(((ContactRemovedEvent) e).getContactId());
@@ -304,12 +300,12 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	}
 
 	@UiThread
-	private void setConnected(ContactId c, boolean connected) {
+	private void setConnectionStatus(ContactId c, ConnectionStatus status) {
 		adapter.incrementRevision();
 		int position = adapter.findItemPosition(c);
 		ContactListItem item = adapter.getItemAt(position);
 		if (item != null) {
-			item.setConnected(connected);
+			item.setConnectionStatus(status);
 			adapter.updateItemAt(position, item);
 		}
 	}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.contact;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 
@@ -15,9 +16,9 @@ public class ContactListItem extends ContactItem {
 	private long timestamp;
 	private int unread;
 
-	public ContactListItem(Contact contact, boolean connected,
+	public ContactListItem(Contact contact, ConnectionStatus status,
 			GroupCount count) {
-		super(contact, connected);
+		super(contact, status);
 		this.empty = count.getMsgCount() == 0;
 		this.unread = count.getUnreadCount();
 		this.timestamp = count.getLatestMsgTime();

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java

@@ -7,7 +7,6 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
-import org.briarproject.briar.android.util.UiUtils;
 
 import java.util.Locale;
 
@@ -15,8 +14,11 @@ import javax.annotation.Nullable;
 
 import androidx.annotation.UiThread;
 
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
 import static androidx.core.view.ViewCompat.setTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.formatDate;
+import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
 
 @UiThread
 @NotNullByDefault
@@ -39,10 +41,11 @@ class ContactListItemViewHolder extends ContactItemViewHolder<ContactListItem> {
 		// unread count
 		int unreadCount = item.getUnreadCount();
 		if (unreadCount > 0) {
-			unread.setText(String.format(Locale.getDefault(), "%d", unreadCount));
-			unread.setVisibility(View.VISIBLE);
+			unread.setText(String.format(Locale.getDefault(), "%d",
+					unreadCount));
+			unread.setVisibility(VISIBLE);
 		} else {
-			unread.setVisibility(View.INVISIBLE);
+			unread.setVisibility(INVISIBLE);
 		}
 
 		// date of last message
@@ -54,8 +57,7 @@ class ContactListItemViewHolder extends ContactItemViewHolder<ContactListItem> {
 		}
 
 		ContactId c = item.getContact().getId();
-		setTransitionName(avatar, UiUtils.getAvatarTransitionName(c));
-		setTransitionName(bulb, UiUtils.getBulbTransitionName(c));
+		setTransitionName(avatar, getAvatarTransitionName(c));
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java

@@ -6,8 +6,7 @@ import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -18,6 +17,8 @@ import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
 
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.CONNECTED;
+
 @NotNullByDefault
 public class SharingControllerImpl implements SharingController, EventListener {
 
@@ -60,15 +61,14 @@ public class SharingControllerImpl implements SharingController, EventListener {
 
 	@Override
 	public void eventOccurred(Event e) {
-		if (e instanceof ContactConnectedEvent) {
-			setConnected(((ContactConnectedEvent) e).getContactId());
-		} else if (e instanceof ContactDisconnectedEvent) {
-			setConnected(((ContactDisconnectedEvent) e).getContactId());
+		if (e instanceof ConnectionStatusChangedEvent) {
+			ConnectionStatusChangedEvent c = (ConnectionStatusChangedEvent) e;
+			setConnectionStatus(c.getContactId());
 		}
 	}
 
 	@UiThread
-	private void setConnected(ContactId c) {
+	private void setConnectionStatus(ContactId c) {
 		if (listener == null) throw new IllegalStateException();
 		if (contacts.contains(c)) {
 			int online = getOnlineCount();
@@ -95,7 +95,9 @@ public class SharingControllerImpl implements SharingController, EventListener {
 	public int getOnlineCount() {
 		int online = 0;
 		for (ContactId c : contacts) {
-			if (connectionRegistry.isConnected(c)) online++;
+			if (connectionRegistry.getConnectionStatus(c) == CONNECTED) {
+				online++;
+			}
 		}
 		return online;
 	}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -13,7 +13,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -34,8 +33,8 @@ import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
+import org.briarproject.bramble.api.plugin.event.ConnectionStatusChangedEvent;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.event.MessagesAckedEvent;
@@ -125,6 +124,8 @@ import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.CONNECTED;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.RECENTLY_CONNECTED;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
@@ -138,7 +139,6 @@ import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHME
 import static org.briarproject.briar.android.conversation.ImageActivity.DATE;
 import static org.briarproject.briar.android.conversation.ImageActivity.NAME;
 import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
-import static org.briarproject.briar.android.util.UiUtils.getBulbTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACHMENTS_PER_MESSAGE;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH;
@@ -198,8 +198,8 @@ public class ConversationActivity extends BriarActivity
 	private ConversationAdapter adapter;
 	private Toolbar toolbar;
 	private CircleImageView toolbarAvatar;
-	private ImageView toolbarStatus;
 	private TextView toolbarTitle;
+	private TextView toolbarStatus;
 	private BriarRecyclerView list;
 	private LinearLayoutManager layoutManager;
 	private TextInputView textInputView;
@@ -237,8 +237,8 @@ public class ConversationActivity extends BriarActivity
 		// Custom Toolbar
 		toolbar = requireNonNull(setUpCustomToolbar(true));
 		toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
-		toolbarStatus = toolbar.findViewById(R.id.contactStatus);
 		toolbarTitle = toolbar.findViewById(R.id.contactName);
+		toolbarStatus = toolbar.findViewById(R.id.contactStatus);
 
 		observeOnce(viewModel.getContactAuthorId(), this, authorId -> {
 			requireNonNull(authorId);
@@ -257,7 +257,6 @@ public class ConversationActivity extends BriarActivity
 				this::onAddedPrivateMessage);
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
-		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
 
 		visitor = new ConversationVisitor(this, this, this,
 				viewModel.getContactDisplayName());
@@ -499,14 +498,14 @@ public class ConversationActivity extends BriarActivity
 
 	@UiThread
 	private void displayContactOnlineStatus() {
-		if (connectionRegistry.isConnected(contactId)) {
-			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
-					ConversationActivity.this, R.drawable.contact_online));
-			toolbarStatus.setContentDescription(getString(R.string.online));
+		ConnectionStatus status =
+				connectionRegistry.getConnectionStatus(contactId);
+		if (status == CONNECTED) {
+			toolbarStatus.setText(R.string.online);
+		} else if (status == RECENTLY_CONNECTED) {
+			toolbarStatus.setText(R.string.recently_online);
 		} else {
-			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
-					ConversationActivity.this, R.drawable.contact_offline));
-			toolbarStatus.setContentDescription(getString(R.string.offline));
+			toolbarStatus.setText(R.string.offline);
 		}
 	}
 
@@ -729,16 +728,10 @@ public class ConversationActivity extends BriarActivity
 				LOG.info("Messages acked");
 				markMessages(m.getMessageIds(), true, true);
 			}
-		} else if (e instanceof ContactConnectedEvent) {
-			ContactConnectedEvent c = (ContactConnectedEvent) e;
+		} else if (e instanceof ConnectionStatusChangedEvent) {
+			ConnectionStatusChangedEvent c = (ConnectionStatusChangedEvent) e;
 			if (c.getContactId().equals(contactId)) {
-				LOG.info("Contact connected");
-				displayContactOnlineStatus();
-			}
-		} else if (e instanceof ContactDisconnectedEvent) {
-			ContactDisconnectedEvent c = (ContactDisconnectedEvent) e;
-			if (c.getContactId().equals(contactId)) {
-				LOG.info("Contact disconnected");
+				LOG.info("Connection status changed");
 				displayContactOnlineStatus();
 			}
 		} else if (e instanceof ClientVersionUpdatedEvent) {

briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java

@@ -12,6 +12,7 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
@@ -73,7 +74,8 @@ public class ContactChooserFragment extends BaseFragment {
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 
 		View contentView = inflater.inflate(R.layout.list, container, false);
@@ -127,9 +129,9 @@ public class ContactChooserFragment extends BaseFragment {
 						ContactId id = c.getId();
 						GroupCount count =
 								conversationManager.getGroupCount(id);
-						boolean connected =
-								connectionRegistry.isConnected(c.getId());
-						contacts.add(new ContactListItem(c, connected, count));
+						ConnectionStatus status = connectionRegistry
+								.getConnectionStatus(c.getId());
+						contacts.add(new ContactListItem(c, status, count));
 					}
 				}
 				displayContacts(contacts);

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java

@@ -99,7 +99,7 @@ public class GroupMemberListActivity extends BriarActivity
 				supportFinishAfterTransition();
 			}
 		}
-		// TODO ContactConnectedEvent and ContactDisconnectedEvent
+		// TODO ConnectionStatusChangedEvent
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListControllerImpl.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.android.controller.DbControllerImpl;
 import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
@@ -19,6 +20,7 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.DISCONNECTED;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 class GroupMemberListControllerImpl extends DbControllerImpl
@@ -50,10 +52,11 @@ class GroupMemberListControllerImpl extends DbControllerImpl
 						privateGroupManager.getMembers(groupId);
 				for (GroupMember m : members) {
 					ContactId c = m.getContactId();
-					boolean online = false;
-					if (c != null)
-						online = connectionRegistry.isConnected(c);
-					items.add(new MemberListItem(m, online));
+					ConnectionStatus status = DISCONNECTED;
+					if (c != null) {
+						status = connectionRegistry.getConnectionStatus(c);
+					}
+					items.add(new MemberListItem(m, status));
 				}
 				handler.onResult(items);
 			} catch (DbException e) {

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java

@@ -45,7 +45,7 @@ class MemberListAdapter extends
 
 	@Override
 	public boolean areContentsTheSame(MemberListItem m1, MemberListItem m2) {
-		if (m1.isOnline() != m2.isOnline()) return false;
+		if (m1.getConnectionStatus() != m2.getConnectionStatus()) return false;
 		if (m1.getContactId() != m2.getContactId()) return false;
 		if (m1.getStatus() != m2.getStatus()) return false;
 		return true;

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.identity.AuthorInfo.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.briar.api.privategroup.GroupMember;
 
 import javax.annotation.Nullable;
@@ -15,11 +16,11 @@ import javax.annotation.concurrent.NotThreadSafe;
 class MemberListItem {
 
 	private final GroupMember groupMember;
-	private boolean online;
+	private ConnectionStatus status;
 
-	MemberListItem(GroupMember groupMember, boolean online) {
+	MemberListItem(GroupMember groupMember, ConnectionStatus status) {
 		this.groupMember = groupMember;
-		this.online = online;
+		this.status = status;
 	}
 
 	Author getMember() {
@@ -43,12 +44,12 @@ class MemberListItem {
 		return groupMember.getContactId();
 	}
 
-	boolean isOnline() {
-		return online;
+	ConnectionStatus getConnectionStatus() {
+		return status;
 	}
 
-	void setOnline(boolean online) {
-		this.online = online;
+	void setConnectionStatus(ConnectionStatus status) {
+		this.status = status;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java

@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.AuthorView;
 
@@ -14,6 +15,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.CONNECTED;
+import static org.briarproject.bramble.api.plugin.ConnectionStatus.RECENTLY_CONNECTED;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
@@ -38,10 +41,13 @@ class MemberListItemHolder extends RecyclerView.ViewHolder {
 		// online status of visible contacts
 		if (item.getContactId() != null) {
 			bulb.setVisibility(VISIBLE);
-			if (item.isOnline()) {
-				bulb.setImageResource(R.drawable.contact_connected);
+			ConnectionStatus status = item.getConnectionStatus();
+			if (status == CONNECTED) {
+				bulb.setImageResource(R.drawable.ic_connected);
+			} else if (status == RECENTLY_CONNECTED) {
+				bulb.setImageResource(R.drawable.ic_recently_connected);
 			} else {
-				bulb.setImageResource(R.drawable.contact_disconnected);
+				bulb.setImageResource(R.drawable.ic_disconnected);
 			}
 		} else {
 			bulb.setVisibility(GONE);

briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java

@@ -14,6 +14,7 @@ import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.plugin.ConnectionStatus;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
 import org.briarproject.briar.R;
@@ -104,7 +105,7 @@ abstract class SharingStatusActivity extends BriarActivity
 				supportFinishAfterTransition();
 			}
 		}
-		// TODO ContactConnectedEvent and ContactDisconnectedEvent
+		// TODO ConnectionStatusChangedEvent
 	}
 
 	@Override
@@ -134,8 +135,9 @@ abstract class SharingStatusActivity extends BriarActivity
 			try {
 				List<ContactItem> contactItems = new ArrayList<>();
 				for (Contact c : getSharedWith()) {
-					boolean online = connectionRegistry.isConnected(c.getId());
-					ContactItem item = new ContactItem(c, online);
+					ConnectionStatus status =
+							connectionRegistry.getConnectionStatus(c.getId());
+					ContactItem item = new ContactItem(c, status);
 					contactItems.add(item);
 				}
 				displaySharedWith(contactItems);

briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

@@ -238,10 +238,6 @@ public class UiUtils {
 		return "avatar" + c.getInt();
 	}
 
-	public static String getBulbTransitionName(ContactId c) {
-		return "bulb" + c.getInt();
-	}
-
 	public static OnClickListener getGoToSettingsListener(Context context) {
 		return (dialog, which) -> {
 			Intent i = new Intent();

briar-android/src/main/res/drawable-night/contact_connected.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-
-	<path
-		android:fillColor="#abffffff"
-		android:pathData="M12,2 C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12 S17.52,2,12,2 Z M12,20
-C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z"/>
-
-	<path
-		android:fillColor="#95d220"
-		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
-C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
-C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295
-C20.0698,10.7495,20.1616,12.4612,19.777,13.9758
-C19.5457,14.8864,18.8106,16.3388,18.2072,17.0771
-C16.4904,19.1779,13.581,20.3215,10.8973,19.9503 Z"
-		android:strokeLineCap="round"
-		android:strokeLineJoin="round"
-		android:strokeWidth="0.76779664"/>
-</vector>

briar-android/src/main/res/drawable-night/contact_disconnected.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#abffffff"
-		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>

briar-android/src/main/res/drawable-night/ic_connected.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#95d220"
+      android:strokeColor="#abffffff"
+      android:fillAlpha="1"/>
+</vector>

briar-android/src/main/res/drawable-night/ic_disconnected.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#abffffff"
+      android:fillType="nonZero"
+      android:fillAlpha="1"/>
+</vector>

briar-android/src/main/res/drawable-night/ic_recently_connected.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="4.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#95d220"
+      android:fillAlpha="1"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#abffffff"
+      android:fillAlpha="1"/>
+</vector>

briar-android/src/main/res/drawable/contact_connected.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:alpha="0.56"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M12,2 C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12 S17.52,2,12,2 Z M12,20
-C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z"/>
-	<path
-		android:pathData="M0,0 L24,0 L24,24 L0,24 Z"/>
-	<path
-		android:fillColor="#95d220"
-		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
-C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
-C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295
-C20.0698,10.7495,20.1616,12.4612,19.777,13.9758
-C19.5457,14.8864,18.8106,16.3388,18.2072,17.0771
-C16.4904,19.1779,13.581,20.3215,10.8973,19.9503 Z"
-		android:strokeLineCap="round"
-		android:strokeLineJoin="round"
-		android:strokeWidth="0.76779664"/>
-</vector>

briar-android/src/main/res/drawable/contact_disconnected.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:alpha="0.56"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>

briar-android/src/main/res/drawable/ic_connected.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#95d220"
+      android:strokeColor="#000000"
+      android:fillAlpha="0.56"/>
+</vector>

briar-android/src/main/res/drawable/ic_disconnected.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillType="nonZero"
+      android:fillAlpha="1"/>
+</vector>

briar-android/src/main/res/drawable/ic_recently_connected.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:strokeAlpha="0.56"
+      android:strokeWidth="4.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#95d220"
+      android:fillAlpha="1"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="1"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillAlpha="1"/>
+</vector>

briar-android/src/main/res/layout/activity_conversation.xml

@@ -18,27 +18,50 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">
 
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:orientation="horizontal">
+			<RelativeLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
 
-				<include layout="@layout/contact_avatar_status" />
+				<de.hdodenhof.circleimageview.CircleImageView
+					android:id="@+id/contactAvatar"
+					style="@style/BriarAvatar"
+					android:layout_width="40dp"
+					android:layout_height="40dp"
+					android:layout_alignParentStart="true"
+					android:layout_alignParentLeft="true"
+					android:layout_margin="4dp"
+					app:civ_border_color="@color/action_bar_text"
+					tools:src="@mipmap/ic_launcher_round" />
 
 				<com.vanniktech.emoji.EmojiTextView
 					android:id="@+id/contactName"
 					style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
 					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_alignParentTop="true"
 					android:layout_marginStart="@dimen/margin_medium"
 					android:layout_marginLeft="@dimen/margin_medium"
+					android:layout_toEndOf="@id/contactAvatar"
+					android:layout_toRightOf="@id/contactAvatar"
 					android:ellipsize="end"
-					android:gravity="center_vertical"
 					android:maxLines="1"
 					android:textColor="@color/action_bar_text"
 					tools:text="Contact Name of someone who chose a long name" />
 
-			</LinearLayout>
+				<TextView
+					android:id="@+id/contactStatus"
+					style="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/contactName"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					android:layout_toEndOf="@id/contactAvatar"
+					android:layout_toRightOf="@id/contactAvatar"
+					android:textColor="@color/briar_text_secondary_inverse"
+					tools:text="Recently online" />
+
+			</RelativeLayout>
 
 		</androidx.appcompat.widget.Toolbar>
 

briar-android/src/main/res/layout/contact_avatar_status.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="32dp"
-	android:layout_height="32dp"
-	tools:showIn="@layout/activity_conversation">
-
-	<de.hdodenhof.circleimageview.CircleImageView
-		android:id="@+id/contactAvatar"
-		style="@style/BriarAvatar"
-		android:layout_width="30dp"
-		android:layout_height="30dp"
-		app:civ_border_color="@color/action_bar_text"
-		tools:src="@mipmap/ic_launcher_round" />
-
-	<ImageView
-		android:id="@+id/contactStatus"
-		android:layout_width="15dp"
-		android:layout_height="15dp"
-		android:layout_gravity="bottom|end|right"
-		android:scaleType="fitCenter"
-		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_online" />
-
-</FrameLayout>

briar-android/src/main/res/layout/list_item_contact.xml

@@ -90,7 +90,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected" />
+		tools:src="@drawable/ic_recently_connected" />
 
 	<View
 		android:id="@+id/divider"

briar-android/src/main/res/layout/list_item_contact_small.xml

@@ -40,6 +40,6 @@
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected" />
+		tools:src="@drawable/ic_connected" />
 
 </LinearLayout>

briar-android/src/main/res/layout/list_item_group_member.xml

@@ -24,7 +24,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected" />
+		tools:src="@drawable/ic_connected" />
 
 	<TextView
 		android:id="@+id/creatorView"

briar-android/src/main/res/values/strings.xml

@@ -110,6 +110,7 @@
 	<string name="decline">Decline</string>
 	<string name="options">Options</string>
 	<string name="online">Online</string>
+	<string name="recently_online">Recently online</string>
 	<string name="offline">Offline</string>
 	<string name="send">Send</string>
 	<string name="allow">Allow</string>