Lambdas.

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java

@@ -124,12 +124,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		// with a message queue, so submit it to the AndroidExecutor
 		try {
 			adapter = androidExecutor.runOnBackgroundThread(
-					new Callable<BluetoothAdapter>() {
+					BluetoothAdapter::getDefaultAdapter).get();
-						@Override
-						public BluetoothAdapter call() throws Exception {
-							return BluetoothAdapter.getDefaultAdapter();
-						}
-					}).get();
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			LOG.warning("Interrupted while getting BluetoothAdapter");
@@ -162,9 +157,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!isRunning()) return;
 			String address = AndroidUtils.getBluetoothAddress(appContext,
 					adapter);
@@ -182,8 +175,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 				ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
 						"RFCOMM", getUuid());
 			} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				return;
 			}
 			if (!isRunning()) {
@@ -195,7 +187,6 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 			backoff.reset();
 			callback.transportEnabled();
 			acceptContactConnections();
-			}
 		});
 	}
 
@@ -300,16 +291,13 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 			if (StringUtils.isNullOrEmpty(address)) continue;
 			final String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(() -> {
-				@Override
-				public void run() {
 				if (!running) return;
 				BluetoothSocket s = connect(address, uuid);
 				if (s != null) {
 					backoff.reset();
 					callback.outgoingConnectionCreated(c, wrapSocket(s));
 				}
-				}
 			});
 		}
 	}
@@ -438,21 +426,11 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	}
 
 	private void enableAdapterAsync() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(this::enableAdapter);
-			@Override
-			public void run() {
-				enableAdapter();
-			}
-		});
 	}
 
 	private void disableAdapterAsync() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(this::disableAdapter);
-			@Override
-			public void run() {
-				disableAdapter();
-			}
-		});
 	}
 
 	private class BluetoothStateReceiver extends BroadcastReceiver {
@@ -490,16 +468,13 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
-				public KeyAgreementConnection call() throws IOException {
 				BluetoothSocket s = ss.accept();
 				if (LOG.isLoggable(INFO))
 					LOG.info(ID.getString() + ": Incoming connection");
 				return new KeyAgreementConnection(
 						new DroidtoothTransportConnection(
 								DroidtoothPlugin.this, s), ID);
-				}
 			};
 		}
 

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -370,20 +370,15 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void sendDevReports() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			// TODO: Trigger this with a TransportEnabledEvent
 			File reportDir = AndroidUtils.getReportDir(appContext);
 			reporter.sendReports(reportDir);
-			}
 		});
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			// If there's already a port number stored in config, reuse it
 			String portString = callback.getSettings().get(PREF_TOR_PORT);
 			int port;
@@ -395,8 +390,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				ss = new ServerSocket();
 				ss.bind(new InetSocketAddress("127.0.0.1", port));
 			} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				tryToClose(ss);
 				return;
 			}
@@ -411,16 +405,10 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			s.put(PREF_TOR_PORT, localPort);
 			callback.mergeSettings(s);
 			// Create a hidden service if necessary
-				ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(() -> publishHiddenService(localPort));
-					@Override
-					public void run() {
-						publishHiddenService(localPort);
-					}
-				});
 			backoff.reset();
 			// Accept incoming hidden service connections from Tor
 			acceptContactConnections(ss);
-			}
 		});
 	}
 
@@ -550,16 +538,13 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	private void connectAndCallBack(final ContactId c,
 			final TransportProperties p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!isRunning()) return;
 			DuplexTransportConnection d = createConnection(p);
 			if (d != null) {
 				backoff.reset();
 				callback.outgoingConnectionCreated(c, d);
 			}
-			}
 		});
 	}
 
@@ -691,9 +676,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void updateConnectionStatus() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!running) return;
 
 			Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
@@ -705,8 +688,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
 					country);
 			Settings s = callback.getSettings();
-				int network = s.getInt(PREF_TOR_NETWORK,
+			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-						PREF_TOR_NETWORK_ALWAYS);
 
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Online: " + online + ", wifi: " + wifi);
@@ -730,9 +712,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 					enableNetwork(true);
 				}
 			} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidExecutorImpl.java

@@ -27,14 +27,11 @@ class AndroidExecutorImpl implements AndroidExecutor {
 	@Inject
 	AndroidExecutorImpl(Application app) {
 		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
-		loop = new Runnable() {
+		loop = () -> {
-			@Override
-			public void run() {
 			Looper.prepare();
 			backgroundHandler = new Handler();
 			startLatch.countDown();
 			Looper.loop();
-			}
 		};
 	}
 

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

@@ -8,12 +8,9 @@ public abstract class BrambleTestCase {
 
 	public BrambleTestCase() {
 		// Ensure exceptions thrown on worker threads cause tests to fail
-		UncaughtExceptionHandler fail = new UncaughtExceptionHandler() {
+		UncaughtExceptionHandler fail = (thread, throwable) -> {
-			@Override
-			public void uncaughtException(Thread thread, Throwable throwable) {
 			throwable.printStackTrace();
 			fail();
-			}
 		};
 		Thread.setDefaultUncaughtExceptionHandler(fail);
 	}

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

@@ -50,9 +50,7 @@ public class PoliteExecutor implements Executor {
 	@Override
 	public void execute(final Runnable r) {
 		final long submitted = System.currentTimeMillis();
-		Runnable wrapped = new Runnable() {
+		Runnable wrapped = () -> {
-			@Override
-			public void run() {
 			if (log.isLoggable(LOG_LEVEL)) {
 				long queued = System.currentTimeMillis() - submitted;
 				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
@@ -62,7 +60,6 @@ public class PoliteExecutor implements Executor {
 			} finally {
 				scheduleNext();
 			}
-			}
 		};
 		synchronized (lock) {
 			if (concurrentTasks < maxConcurrentTasks) {

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

@@ -31,16 +31,13 @@ public class TimeLoggingExecutor extends ThreadPoolExecutor {
 	public void execute(final Runnable r) {
 		if (log.isLoggable(LOG_LEVEL)) {
 			final long submitted = System.currentTimeMillis();
-			super.execute(new Runnable() {
+			super.execute(() -> {
-				@Override
-				public void run() {
 				long started = System.currentTimeMillis();
 				long queued = started - submitted;
 				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
 				r.run();
 				long executing = System.currentTimeMillis() - started;
 				log.log(LOG_LEVEL, "Execution time " + executing + " ms");
-				}
 			});
 		} else {
 			super.execute(r);

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -103,15 +103,11 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 
 	@Override
 	public boolean open() throws DbException {
-		Runnable shutdownHook = new Runnable() {
+		Runnable shutdownHook = () -> {
-			@Override
-			public void run() {
 			try {
 				close();
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		};
 		boolean reopened = db.open();

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

@@ -266,12 +266,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			contactId = ctx.getContactId();
 			connectionRegistry.registerConnection(contactId, transportId, true);
 			// Start the outgoing session on another thread
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(this::runOutgoingSession);
-				@Override
-				public void run() {
-					runOutgoingSession();
-				}
-			});
 			try {
 				// Create and run the incoming session
 				incomingSession = createIncomingSession(ctx, reader);
@@ -368,12 +363,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 				return;
 			}
 			// Start the incoming session on another thread
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(this::runIncomingSession);
-				@Override
-				public void run() {
-					runIncomingSession();
-				}
-			});
 			try {
 				// Create and run the outgoing session
 				outgoingSession = createDuplexOutgoingSession(ctx, writer);

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

@@ -112,30 +112,24 @@ class Poller implements EventListener {
 	}
 
 	private void connectToContact(final ContactId c, final SimplexPlugin p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			TransportId t = p.getId();
 			if (!connectionRegistry.isConnected(c, t)) {
 				TransportConnectionWriter w = p.createWriter(c);
 				if (w != null)
 					connectionManager.manageOutgoingConnection(c, t, w);
 			}
-			}
 		});
 	}
 
 	private void connectToContact(final ContactId c, final DuplexPlugin p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			TransportId t = p.getId();
 			if (!connectionRegistry.isConnected(c, t)) {
 				DuplexTransportConnection d = p.createConnection(c);
 				if (d != null)
 					connectionManager.manageOutgoingConnection(c, t, d);
 			}
-			}
 		});
 	}
 
@@ -161,12 +155,8 @@ class Poller implements EventListener {
 			if (scheduled == null || due < scheduled.due) {
 				final PollTask task = new PollTask(p, due, randomiseNext);
 				tasks.put(t, task);
-				scheduler.schedule(new Runnable() {
+				scheduler.schedule(
-					@Override
+						() -> ioExecutor.execute(task), delay, MILLISECONDS);
-					public void run() {
-						ioExecutor.execute(task);
-					}
-				}, delay, MILLISECONDS);
 			}
 		} finally {
 			lock.unlock();

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java

@@ -260,16 +260,12 @@ class LanTcpPlugin extends TcpPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
-				public KeyAgreementConnection call() throws IOException {
 				Socket s = ss.accept();
 				if (LOG.isLoggable(INFO))
 					LOG.info(ID.getString() + ": Incoming connection");
 				return new KeyAgreementConnection(
-							new TcpTransportConnection(LanTcpPlugin.this, s),
+						new TcpTransportConnection(LanTcpPlugin.this, s), ID);
-							ID);
-				}
 			};
 		}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java

@@ -50,12 +50,7 @@ class PortMapperImpl implements PortMapper {
 			succeeded = gateway.addPortMapping(port, port,
 					getHostAddress(internal), "TCP", "TCP");
 			if (succeeded) {
-				shutdownManager.addShutdownHook(new Runnable() {
+				shutdownManager.addShutdownHook(() -> deleteMapping(port));
-					@Override
-					public void run() {
-						deleteMapping(port);
-					}
-				});
 			}
 			String externalString = gateway.getExternalIPAddress();
 			if (LOG.isLoggable(INFO))

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

@@ -110,9 +110,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 	}
 
 	protected void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!running) return;
 			ServerSocket ss = null;
 			for (InetSocketAddress addr : getLocalSocketAddresses()) {
@@ -122,8 +120,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 					break;
 				} catch (IOException e) {
 					if (LOG.isLoggable(INFO))
-							LOG.info("Failed to bind " +
+						LOG.info("Failed to bind " + scrubSocketAddress(addr));
-									scrubSocketAddress(addr));
 					tryToClose(ss);
 				}
 			}
@@ -144,7 +141,6 @@ abstract class TcpPlugin implements DuplexPlugin {
 				LOG.info("Listening on " + scrubSocketAddress(local));
 			callback.transportEnabled();
 			acceptContactConnections();
-			}
 		});
 	}
 
@@ -220,16 +216,13 @@ abstract class TcpPlugin implements DuplexPlugin {
 
 	private void connectAndCallBack(final ContactId c,
 			final TransportProperties p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!isRunning()) return;
 			DuplexTransportConnection d = createConnection(p);
 			if (d != null) {
 				backoff.reset();
 				callback.outgoingConnectionCreated(c, d);
 			}
-			}
 		});
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java

@@ -54,9 +54,7 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
 		inputStream = new ReceiverInputStream(receiver);
 		outputStream = new SenderOutputStream(sender);
 		running = true;
-		executor.execute(new Runnable() {
+		executor.execute(() -> {
-			@Override
-			public void run() {
 			long now = clock.currentTimeMillis();
 			long next = now + TICK_INTERVAL;
 			try {
@@ -80,11 +78,9 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
 				Thread.currentThread().interrupt();
 				running = false;
 			} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				running = false;
 			}
-			}
 		});
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java

@@ -54,12 +54,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(DuplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE =
+	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
-			new ThrowingRunnable<IOException>() {
-				@Override
-				public void run() {
-				}
-			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;

bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java

@@ -43,12 +43,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(SimplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE =
+	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
-			new ThrowingRunnable<IOException>() {
-				@Override
-				public void run() {
-				}
-			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;

bramble-core/src/main/java/org/briarproject/bramble/sync/ValidationManagerImpl.java

@@ -94,12 +94,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	}
 
 	private void validateOutstandingMessagesAsync(final ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> validateOutstandingMessages(c));
-			@Override
-			public void run() {
-				validateOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -121,12 +116,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 
 	private void validateNextMessageAsync(final Queue<MessageId> unvalidated) {
 		if (unvalidated.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> validateNextMessage(unvalidated));
-			@Override
-			public void run() {
-				validateNextMessage(unvalidated);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -159,12 +149,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	}
 
 	private void deliverOutstandingMessagesAsync(final ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> deliverOutstandingMessages(c));
-			@Override
-			public void run() {
-				deliverOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -187,12 +172,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	private void deliverNextPendingMessageAsync(
 			final Queue<MessageId> pending) {
 		if (pending.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> deliverNextPendingMessage(pending));
-			@Override
-			public void run() {
-				deliverNextPendingMessage(pending);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -255,12 +235,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	}
 
 	private void validateMessageAsync(final Message m, final Group g) {
-		validationExecutor.execute(new Runnable() {
+		validationExecutor.execute(() -> validateMessage(m, g));
-			@Override
-			public void run() {
-				validateMessage(m, g);
-			}
-		});
 	}
 
 	@ValidationExecutor
@@ -285,12 +260,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 
 	private void storeMessageContextAsync(final Message m, final ClientId c,
 			final MessageContext result) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> storeMessageContext(m, c, result));
-			@Override
-			public void run() {
-				storeMessageContext(m, c, result);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -385,12 +355,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	}
 
 	private void shareOutstandingMessagesAsync(final ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> shareOutstandingMessages(c));
-			@Override
-			public void run() {
-				shareOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -418,12 +383,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	 */
 	private void shareNextMessageAsync(final Queue<MessageId> toShare) {
 		if (toShare.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> shareNextMessage(toShare));
-			@Override
-			public void run() {
-				shareNextMessage(toShare);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -452,12 +412,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 
 	private void invalidateNextMessageAsync(final Queue<MessageId> invalidate) {
 		if (invalidate.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> invalidateNextMessage(invalidate));
-			@Override
-			public void run() {
-				invalidateNextMessage(invalidate);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -513,12 +468,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	}
 
 	private void loadGroupAndValidateAsync(final Message m) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> loadGroupAndValidate(m));
-			@Override
-			public void run() {
-				loadGroupAndValidate(m);
-			}
-		});
 	}
 
 	@DatabaseExecutor

bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java

@@ -157,12 +157,8 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 
 	private void removeContact(final ContactId c) {
 		activeContacts.remove(c);
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
+			for (TransportKeyManager m : managers.values()) m.removeContact(c);
-			public void run() {
-				for (TransportKeyManager m : managers.values())
-					m.removeContact(c);
-			}
 		});
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -134,20 +134,12 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 	}
 
 	private void scheduleKeyRotation(long now) {
-		Runnable task = new Runnable() {
-			@Override
-			public void run() {
-				rotateKeys();
-			}
-		};
 		long delay = rotationPeriodLength - now % rotationPeriodLength;
-		scheduler.schedule(task, delay, MILLISECONDS);
+		scheduler.schedule((Runnable) this::rotateKeys, delay, MILLISECONDS);
 	}
 
 	private void rotateKeys() {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
-			public void run() {
 			try {
 				Transaction txn = db.startTransaction(false);
 				try {
@@ -157,9 +149,7 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 					db.endTransaction(txn);
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}

bramble-core/src/test/java/org/briarproject/bramble/PoliteExecutorTest.java

@@ -28,12 +28,9 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
 			final int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
-				public void run() {
 				list.add(result);
 				latch.countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -53,12 +50,9 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
 			final int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
-				public void run() {
 				list.add(result);
 				latch.countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -78,9 +72,7 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		for (int i = 0; i < TASKS; i++) latches[i] = new CountDownLatch(1);
 		for (int i = 0; i < TASKS; i++) {
 			final int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
-				public void run() {
 				try {
 					// Each task waits for the next task, if any, to finish
 					if (result < TASKS - 1) latches[result + 1].await();
@@ -89,7 +81,6 @@ public class PoliteExecutorTest extends BrambleTestCase {
 					fail();
 				}
 				latches[result].countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -108,9 +99,7 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
 			final int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
-				public void run() {
 				try {
 					// Each task runs faster than the previous task
 					Thread.sleep(TASKS - result);
@@ -119,7 +108,6 @@ public class PoliteExecutorTest extends BrambleTestCase {
 					fail();
 				}
 				latch.countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish

bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java

@@ -17,11 +17,7 @@ public class ShutdownManagerImplTest extends BrambleTestCase {
 		ShutdownManager s = createShutdownManager();
 		Set<Integer> handles = new HashSet<>();
 		for (int i = 0; i < 100; i++) {
-			int handle = s.addShutdownHook(new Runnable() {
+			int handle = s.addShutdownHook(() -> {});
-				@Override
-				public void run() {
-				}
-			});
 			// The handles should all be distinct
 			assertTrue(handles.add(handle));
 		}

bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java

@@ -113,17 +113,13 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
 				final User32 user32 = (User32) Native.loadLibrary("user32",
 						User32.class, options);
 				// Create a callback to handle the WM_QUERYENDSESSION message
-				WindowProc proc = new WindowProc() {
+				WindowProc proc = (hwnd, msg, wp, lp) -> {
-					@Override
-					public LRESULT callback(HWND hwnd, int msg, WPARAM wp,
-							LPARAM lp) {
 					if (msg == WM_QUERYENDSESSION) {
 						// It's safe to delay returning from this message
 						runShutdownHooks();
 					}
 					// Pass the message to the default window procedure
 					return user32.DefWindowProc(hwnd, msg, wp, lp);
-					}
 				};
 				// Create a native window
 				HWND hwnd = user32.CreateWindowEx(0, "STATIC", "", WS_MINIMIZE,

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

@@ -108,9 +108,7 @@ class BluetoothPlugin implements DuplexPlugin {
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (!running) return;
 			// Advertise the Bluetooth address to contacts
 			TransportProperties p = new TransportProperties();
@@ -134,7 +132,6 @@ class BluetoothPlugin implements DuplexPlugin {
 			backoff.reset();
 			callback.transportEnabled();
 			acceptContactConnections(ss);
-			}
 		});
 	}
 
@@ -220,20 +217,18 @@ class BluetoothPlugin implements DuplexPlugin {
 			if (StringUtils.isNullOrEmpty(address)) continue;
 			final String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(() -> {
-				@Override
-				public void run() {
 				if (!running) return;
 				StreamConnection s = connect(makeUrl(address, uuid));
 				if (s != null) {
 					backoff.reset();
 					callback.outgoingConnectionCreated(c, wrapSocket(s));
 				}
-				}
 			});
 		}
 	}
 
+	@Nullable
 	private StreamConnection connect(String url) {
 		if (LOG.isLoggable(INFO)) LOG.info("Connecting to " + url);
 		try {
@@ -341,16 +336,13 @@ class BluetoothPlugin implements DuplexPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
-				public KeyAgreementConnection call() throws Exception {
 				StreamConnection s = ss.acceptAndOpen();
 				if (LOG.isLoggable(INFO))
 					LOG.info(ID.getString() + ": Incoming connection");
 				return new KeyAgreementConnection(
 						new BluetoothTransportConnection(
 								BluetoothPlugin.this, s), ID);
-				}
 			};
 		}
 

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java

@@ -390,16 +390,13 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
 						lock.unlock();
 					}
 				} else if (s.equals("RING")) {
-					ioExecutor.execute(new Runnable() {
+					ioExecutor.execute(() -> {
-						@Override
-						public void run() {
 						try {
 							answer();
 						} catch (IOException e) {
 							if (LOG.isLoggable(WARNING))
 								LOG.log(WARNING, e.toString(), e);
 						}
-						}
 					});
 				}
 			} else {

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

@@ -44,7 +44,6 @@ import org.briarproject.briar.api.sharing.event.InvitationResponseReceivedEvent;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
@@ -138,16 +137,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 	@Override
 	public void stopService() throws ServiceException {
 		// Clear all notifications
-		Future<Void> f = androidExecutor.runOnUiThread(new Callable<Void>() {
+		Future<Void> f = androidExecutor.runOnUiThread(() -> {
-			@Override
-			public Void call() {
 			clearContactNotification();
 			clearGroupMessageNotification();
 			clearForumPostNotification();
 			clearBlogPostNotification();
 			clearIntroductionSuccessNotification();
 			return null;
-			}
 		});
 		try {
 			f.get();
@@ -236,23 +232,18 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 	}
 
 	private void loadSettings() {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
-			public void run() {
 			try {
 				settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
 			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING))
 					LOG.log(WARNING, e.toString(), e);
 			}
-			}
 		});
 	}
 
 	private void showContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (blockContacts) return;
 			if (c.equals(blockedContact)) return;
 			Integer count = contactCounts.get(c);
@@ -260,20 +251,16 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			else contactCounts.put(c, count + 1);
 			contactTotal++;
 			updateContactNotification(true);
-			}
 		});
 	}
 
 	@Override
 	public void clearContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			Integer count = contactCounts.remove(c);
 			if (count == null) return; // Already cleared
 			contactTotal -= count;
 			updateContactNotification(false);
-			}
 		});
 	}
 
@@ -358,19 +345,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllContactNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearContactNotification);
-			public void run() {
-				clearContactNotification();
-			}
-		});
 	}
 
 	@UiThread
 	private void showGroupMessageNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (blockGroups) return;
 			if (g.equals(blockedGroup)) return;
 			Integer count = groupCounts.get(g);
@@ -378,20 +359,16 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			else groupCounts.put(g, count + 1);
 			groupTotal++;
 			updateGroupMessageNotification(true);
-			}
 		});
 	}
 
 	@Override
 	public void clearGroupMessageNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			Integer count = groupCounts.remove(g);
 			if (count == null) return; // Already cleared
 			groupTotal -= count;
 			updateGroupMessageNotification(false);
-			}
 		});
 	}
 
@@ -445,19 +422,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllGroupMessageNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearGroupMessageNotification);
-			public void run() {
-				clearGroupMessageNotification();
-			}
-		});
 	}
 
 	@UiThread
 	private void showForumPostNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (blockForums) return;
 			if (g.equals(blockedGroup)) return;
 			Integer count = forumCounts.get(g);
@@ -465,20 +436,16 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			else forumCounts.put(g, count + 1);
 			forumTotal++;
 			updateForumPostNotification(true);
-			}
 		});
 	}
 
 	@Override
 	public void clearForumPostNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			Integer count = forumCounts.remove(g);
 			if (count == null) return; // Already cleared
 			forumTotal -= count;
 			updateForumPostNotification(false);
-			}
 		});
 	}
 
@@ -532,19 +499,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllForumPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearForumPostNotification);
-			public void run() {
-				clearForumPostNotification();
-			}
-		});
 	}
 
 	@UiThread
 	private void showBlogPostNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (blockBlogs) return;
 			if (g.equals(blockedGroup)) return;
 			Integer count = blogCounts.get(g);
@@ -552,20 +513,16 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			else blogCounts.put(g, count + 1);
 			blogTotal++;
 			updateBlogPostNotification(true);
-			}
 		});
 	}
 
 	@Override
 	public void clearBlogPostNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			Integer count = blogCounts.remove(g);
 			if (count == null) return; // Already cleared
 			blogTotal -= count;
 			updateBlogPostNotification(false);
-			}
 		});
 	}
 
@@ -606,22 +563,15 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearBlogPostNotification);
-			public void run() {
-				clearBlogPostNotification();
-			}
-		});
 	}
 
 	private void showIntroductionNotification() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (blockIntroductions) return;
 			introductionTotal++;
 			updateIntroductionNotification();
-			}
 		});
 	}
 
@@ -656,71 +606,41 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllIntroductionNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				this::clearIntroductionSuccessNotification);
-			public void run() {
-				clearIntroductionSuccessNotification();
-			}
-		});
 	}
 
 	@Override
 	public void blockNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockedGroup = g);
-			@Override
-			public void run() {
-				blockedGroup = g;
-			}
-		});
 	}
 
 	@Override
 	public void unblockNotification(final GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (g.equals(blockedGroup)) blockedGroup = null;
-			}
 		});
 	}
 
 	@Override
 	public void blockContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockedContact = c);
-			@Override
-			public void run() {
-				blockedContact = c;
-			}
-		});
 	}
 
 	@Override
 	public void unblockContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (c.equals(blockedContact)) blockedContact = null;
-			}
 		});
 	}
 
 	@Override
 	public void blockAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockBlogs = true);
-			@Override
-			public void run() {
-				blockBlogs = true;
-			}
-		});
 	}
 
 	@Override
 	public void unblockAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockBlogs = false);
-			@Override
-			public void run() {
-				blockBlogs = false;
-			}
-		});
 	}
 }

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

@@ -112,9 +112,7 @@ public class BriarService extends Service {
 	}
 
 	private void showStartupFailureNotification(final StartResult result) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
-			public void run() {
 			NotificationCompat.Builder b =
 					new NotificationCompat.Builder(BriarService.this);
 			b.setSmallIcon(android.R.drawable.stat_notify_error);
@@ -138,7 +136,6 @@ public class BriarService extends Service {
 			i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
 			i.putExtra("briar.STARTUP_FAILED", true);
 			startActivity(i);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -152,11 +152,8 @@ public abstract class BaseActivity extends AppCompatActivity
 
 	@Override
 	public void runOnUiThreadUnlessDestroyed(final Runnable r) {
-		runOnUiThread(new Runnable() {
+		runOnUiThread(() -> {
-			@Override
-			public void run() {
 			if (!destroyed && !isFinishing()) r.run();
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java

@@ -13,7 +13,6 @@ import android.view.Window;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.DbController;
-import org.briarproject.briar.android.controller.handler.ResultHandler;
 import org.briarproject.briar.android.login.PasswordActivity;
 import org.briarproject.briar.android.panic.ExitActivity;
 
@@ -102,17 +101,8 @@ public abstract class BriarActivity extends BaseActivity {
 		if (briarController.hasEncryptionKey()) {
 			// Don't use UiResultHandler because we want the result even if
 			// this activity has been destroyed
-			briarController.signOut(new ResultHandler<Void>() {
+			briarController.signOut(result -> runOnUiThread(
-				@Override
+					() -> exit(removeFromRecentApps)));
-				public void onResult(Void result) {
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							exit(removeFromRecentApps);
-						}
-					});
-				}
-			});
 		} else {
 			exit(removeFromRecentApps);
 		}
@@ -146,11 +136,6 @@ public abstract class BriarActivity extends BaseActivity {
 
 	@Deprecated
 	protected void finishOnUiThread() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(this::supportFinishAfterTransition);
-			@Override
-			public void run() {
-				supportFinishAfterTransition();
-			}
-		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java

@@ -85,30 +85,18 @@ abstract class BaseControllerImpl extends DbControllerImpl
 	}
 
 	void onBlogPostAdded(final BlogPostHeader h, final boolean local) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onBlogPostAdded(h, local));
-			public void run() {
-				listener.onBlogPostAdded(h, local);
-			}
-		});
 	}
 
 	void onBlogRemoved() {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogRemoved());
-			@Override
-			public void run() {
-				listener.onBlogRemoved();
 	}
-		});
-	}
-
 
 	@Override
 	public void loadBlogPosts(final GroupId groupId,
 			final ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Collection<BlogPostItem> items = loadItems(groupId);
 				handler.onResult(items);
@@ -117,7 +105,6 @@ abstract class BaseControllerImpl extends DbControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -151,9 +138,7 @@ abstract class BaseControllerImpl extends DbControllerImpl
 			handler.onResult(new BlogPostItem(header, body));
 			return;
 		}
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				BlogPostItem item = getItem(header);
@@ -166,7 +151,6 @@ abstract class BaseControllerImpl extends DbControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -180,13 +164,11 @@ abstract class BaseControllerImpl extends DbControllerImpl
 			loadBlogPost(header, handler);
 			return;
 		}
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
-					BlogPostHeader header = getPostHeader(g, m);
+				BlogPostHeader header1 = getPostHeader(g, m);
-					BlogPostItem item = getItem(header);
+				BlogPostItem item = getItem(header1);
 				long duration = System.currentTimeMillis() - now;
 				if (LOG.isLoggable(INFO))
 					LOG.info("Loading post took " + duration + " ms");
@@ -196,7 +178,6 @@ abstract class BaseControllerImpl extends DbControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -204,9 +185,7 @@ abstract class BaseControllerImpl extends DbControllerImpl
 	public void repeatPost(final BlogPostItem item,
 			final @Nullable String comment,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor a = identityManager.getLocalAuthor();
 				Blog b = blogManager.getPersonalBlog(a);
@@ -217,7 +196,6 @@ abstract class BaseControllerImpl extends DbControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java

@@ -99,13 +99,10 @@ abstract class BasePostFragment extends BaseFragment {
 	}
 
 	private void startPeriodicUpdate() {
-		refresher = new Runnable() {
+		refresher = () -> {
-			@Override
-			public void run() {
 			LOG.info("Updating Content...");
 			ui.updateDate(post.getTimestamp());
 			handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
-			}
 		};
 		LOG.info("Adding Handler Callback");
 		handler.postDelayed(refresher, MIN_DATE_RESOLUTION);

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.blog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.view.View;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -41,15 +40,11 @@ public class BlogActivity extends BriarActivity
 
 		// Open Sharing Status on Toolbar click
 		if (toolbar != null) {
-			toolbar.setOnClickListener(
+			toolbar.setOnClickListener(v -> {
-					new View.OnClickListener() {
+				Intent i1 = new Intent(BlogActivity.this,
-						@Override
-						public void onClick(View v) {
-							Intent i = new Intent(BlogActivity.this,
 						BlogSharingStatusActivity.class);
-							i.putExtra(GROUP_ID, groupId.getBytes());
+				i1.putExtra(GROUP_ID, groupId.getBytes());
-							startActivity(i);
+				startActivity(i1);
-						}
 			});
 		}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java

@@ -126,21 +126,12 @@ class BlogControllerImpl extends BaseControllerImpl
 	}
 
 	private void onBlogInvitationAccepted(final ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onBlogInvitationAccepted(c));
-			public void run() {
-				listener.onBlogInvitationAccepted(c);
-			}
-		});
 	}
 
 	private void onBlogLeft(final ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogLeft(c));
-			@Override
-			public void run() {
-				listener.onBlogLeft(c);
-			}
-		});
 	}
 
 	@Override
@@ -161,9 +152,7 @@ class BlogControllerImpl extends BaseControllerImpl
 	public void loadBlog(
 			final ResultExceptionHandler<BlogItem, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				LocalAuthor a = identityManager.getLocalAuthor();
@@ -180,7 +169,6 @@ class BlogControllerImpl extends BaseControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -188,9 +176,7 @@ class BlogControllerImpl extends BaseControllerImpl
 	public void deleteBlog(
 			final ResultExceptionHandler<Void, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Blog b = blogManager.getBlog(groupId);
@@ -204,7 +190,6 @@ class BlogControllerImpl extends BaseControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -212,9 +197,7 @@ class BlogControllerImpl extends BaseControllerImpl
 	public void loadSharingContacts(
 			final ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Collection<Contact> contacts =
 						blogSharingManager.getSharedWith(groupId);
@@ -227,7 +210,6 @@ class BlogControllerImpl extends BaseControllerImpl
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java

@@ -331,12 +331,7 @@ public class BlogFragment extends BaseFragment
 				Snackbar.make(list, stringId, Snackbar.LENGTH_LONG);
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
 		if (scroll) {
-			View.OnClickListener onClick = new View.OnClickListener() {
+			View.OnClickListener onClick = v -> list.smoothScrollToPosition(0);
-				@Override
-				public void onClick(View v) {
-					list.smoothScrollToPosition(0);
-				}
-			};
 			snackbar.setActionTextColor(ContextCompat
 					.getColor(getContext(),
 							R.color.briar_button_positive));
@@ -347,12 +342,7 @@ public class BlogFragment extends BaseFragment
 
 	private void showDeleteDialog() {
 		DialogInterface.OnClickListener okListener =
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> deleteBlog();
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteBlog();
-					}
-				};
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_remove_blog));

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java

@@ -13,7 +13,6 @@ import android.support.v7.widget.RecyclerView;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -95,12 +94,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		setTransitionName(item.getId());
 		if (!fullText) {
 			layout.setClickable(true);
-			layout.setOnClickListener(new OnClickListener() {
+			layout.setOnClickListener(v -> listener.onBlogPostClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onBlogPostClick(item);
-				}
-			});
 		}
 
 		// author and date
@@ -113,12 +107,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 				item.isRssFeed() ? AuthorView.RSS_FEED : AuthorView.NORMAL);
 		// TODO make author clickable more often #624
 		if (!fullText && item.getHeader().getType() == POST) {
-			author.setAuthorClickable(new OnClickListener() {
+			author.setAuthorClickable(v -> listener.onAuthorClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onAuthorClick(item);
-				}
-			});
 		} else {
 			author.setAuthorNotClickable();
 		}
@@ -137,9 +126,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		}
 
 		// reblog button
-		reblogButton.setOnClickListener(new OnClickListener() {
+		reblogButton.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			Intent i = new Intent(ctx, ReblogActivity.class);
 			i.putExtra(GROUP_ID, item.getGroupId().getBytes());
 			i.putExtra(POST_ID, item.getId().getBytes());
@@ -154,7 +141,6 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 				// work-around for android bug #224270
 				ctx.startActivity(i);
 			}
-			}
 		});
 
 		// comments
@@ -172,12 +158,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		reblogger.setAuthorStatus(item.getAuthorStatus());
 		reblogger.setDate(item.getTimestamp());
 		if (!fullText) {
-			reblogger.setAuthorClickable(new OnClickListener() {
+			reblogger.setAuthorClickable(v -> listener.onAuthorClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onAuthorClick(item);
-				}
-			});
 		}
 		reblogger.setVisibility(VISIBLE);
 		reblogger.setPersona(AuthorView.REBLOGGER);

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedControllerImpl.java

@@ -91,20 +91,13 @@ class FeedControllerImpl extends BaseControllerImpl
 	}
 
 	private void onBlogAdded() {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogAdded());
-			@Override
-			public void run() {
-				listener.onBlogAdded();
-			}
-		});
 	}
 
 	@Override
 	public void loadBlogPosts(
 			final ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Collection<BlogPostItem> posts = new ArrayList<>();
@@ -121,20 +114,16 @@ class FeedControllerImpl extends BaseControllerImpl
 					LOG.info("Loading all posts took " + duration + " ms");
 				handler.onResult(posts);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	@Override
 	public void loadPersonalBlog(
 			final ResultExceptionHandler<Blog, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Author a = identityManager.getLocalAuthor();
@@ -144,11 +133,9 @@ class FeedControllerImpl extends BaseControllerImpl
 					LOG.info("Loading blog took " + duration + " ms");
 				handler.onResult(b);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java

@@ -246,12 +246,7 @@ public class FeedFragment extends BaseFragment implements
 		Snackbar s = Snackbar.make(list, stringRes, LENGTH_LONG);
 		s.getView().setBackgroundResource(R.color.briar_primary);
 		if (scroll) {
-			OnClickListener onClick = new OnClickListener() {
+			OnClickListener onClick = v -> list.smoothScrollToPosition(0);
-				@Override
-				public void onClick(View v) {
-					list.smoothScrollToPosition(0);
-				}
-			};
 			s.setActionTextColor(ContextCompat
 					.getColor(getContext(),
 							R.color.briar_button_positive));

briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java

@@ -114,12 +114,7 @@ public class ReblogFragment extends BaseFragment implements TextInputListener {
 
 		ui.input.setListener(this);
 		ui.input.setSendButtonEnabled(true);
-		ui.scrollView.post(new Runnable() {
+		ui.scrollView.post(() -> ui.scrollView.fullScroll(FOCUS_DOWN));
-			@Override
-			public void run() {
-				ui.scrollView.fullScroll(FOCUS_DOWN);
-			}
-		});
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -42,12 +41,7 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> {
 		ui.title.setText(item.getTitle());
 
 		// Delete Button
-		ui.delete.setOnClickListener(new OnClickListener() {
+		ui.delete.setOnClickListener(v -> listener.onDeleteClick(item));
-			@Override
-			public void onClick(View v) {
-				listener.onDeleteClick(item);
-			}
-		});
 
 		// Author
 		if (item.getAuthor() != null) {
@@ -72,12 +66,7 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> {
 		}
 
 		// Open feed's blog when clicked
-		ui.layout.setOnClickListener(new OnClickListener() {
+		ui.layout.setOnClickListener(v -> listener.onFeedClick(item));
-			@Override
-			public void onClick(View v) {
-				listener.onFeedClick(item);
-			}
-		});
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.blog;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -8,7 +7,6 @@ import android.text.TextWatcher;
 import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -75,12 +73,7 @@ public class RssFeedImportActivity extends BriarActivity {
 		});
 
 		importButton = (Button) findViewById(R.id.importButton);
-		importButton.setOnClickListener(new View.OnClickListener() {
+		importButton.setOnClickListener(v -> publish());
-			@Override
-			public void onClick(View v) {
-				publish();
-			}
-		});
 
 		progressBar = (ProgressBar) findViewById(R.id.progressBar);
 	}
@@ -126,34 +119,23 @@ public class RssFeedImportActivity extends BriarActivity {
 	}
 
 	private void importFeed(final String url) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			try {
 				feedManager.addFeed(url);
 				feedImported();
 			} catch (DbException | IOException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				importFailed();
 			}
-			}
 		});
 	}
 
 	private void feedImported() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(this::supportFinishAfterTransition);
-			@Override
-			public void run() {
-				supportFinishAfterTransition();
-			}
-		});
 	}
 
 	private void importFailed() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			// hide progress bar, show publish button
 			progressBar.setVisibility(GONE);
 			importButton.setVisibility(VISIBLE);
@@ -165,15 +147,9 @@ public class RssFeedImportActivity extends BriarActivity {
 			builder.setMessage(R.string.blogs_rss_feeds_import_error);
 			builder.setNegativeButton(R.string.cancel, null);
 			builder.setPositiveButton(R.string.try_again_button,
-						new DialogInterface.OnClickListener() {
+					(dialog, which) -> publish());
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								publish();
-							}
-						});
 			AlertDialog dialog = builder.create();
 			dialog.show();
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java

@@ -105,12 +105,7 @@ public class RssFeedManageActivity extends BriarActivity
 	@Override
 	public void onDeleteClick(final Feed feed) {
 		DialogInterface.OnClickListener okListener =
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> deleteFeed(feed);
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteFeed(feed);
-					}
-				};
 		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_rss_remove_feed));
@@ -124,24 +119,18 @@ public class RssFeedManageActivity extends BriarActivity
 
 	private void loadFeeds() {
 		final int revision = adapter.getRevision();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				displayFeeds(revision, feedManager.getFeeds());
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				onLoadError();
 			}
-			}
 		});
 	}
 
 	private void displayFeeds(final int revision, final List<Feed> feeds) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				if (feeds.isEmpty()) list.showData();
@@ -150,55 +139,39 @@ public class RssFeedManageActivity extends BriarActivity
 				LOG.info("Concurrent update, reloading");
 				loadFeeds();
 			}
-			}
 		});
 	}
 
 	private void deleteFeed(final Feed feed) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				feedManager.removeFeed(feed);
 				onFeedDeleted(feed);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				onDeleteError();
 			}
-			}
 		});
 	}
 
 	private void onLoadError() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			list.setEmptyText(R.string.blogs_rss_feeds_manage_error);
 			list.showData();
-			}
 		});
 	}
 
 	private void onFeedDeleted(final Feed feed) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			adapter.remove(feed);
-			}
 		});
 	}
 
 	private void onDeleteError() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> Snackbar.make(list,
-			@Override
-			public void run() {
-				Snackbar.make(list,
 				R.string.blogs_rss_feeds_manage_delete_error,
-						LENGTH_LONG).show();
+				LENGTH_LONG).show());
-			}
-		});
 	}
 }
 

briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java

@@ -141,9 +141,7 @@ public class WriteBlogPostActivity extends BriarActivity
 	}
 
 	private void storePost(final String body) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			long now = System.currentTimeMillis();
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
@@ -151,34 +149,27 @@ public class WriteBlogPostActivity extends BriarActivity
 						.createBlogPost(groupId, now, null, author, body);
 				blogManager.addLocalPost(p);
 				postPublished();
-				} catch (DbException | GeneralSecurityException | FormatException e) {
+			} catch (DbException | GeneralSecurityException
-					if (LOG.isLoggable(WARNING))
+					| FormatException e) {
-						LOG.log(WARNING, e.toString(), e);
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				postFailedToPublish();
 			}
-			}
 		});
 	}
 
 	private void postPublished() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			setResult(RESULT_OK);
 			supportFinishAfterTransition();
-			}
 		});
 	}
 
 	private void postFailedToPublish() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			// hide progress bar, show publish button
 			progressBar.setVisibility(GONE);
 			input.setVisibility(VISIBLE);
 			// TODO show error
-			}
 		});
 	}
 }

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

@@ -54,11 +54,8 @@ public class ContactItemViewHolder<I extends ContactItem>
 			}
 		}
 
-		layout.setOnClickListener(new View.OnClickListener() {
+		layout.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			if (listener != null) listener.onItemClick(avatar, item);
-			}
 		});
 	}
 

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

@@ -114,9 +114,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		View contentView = inflater.inflate(R.layout.list, container, false);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
-				new OnContactClickListener<ContactListItem>() {
+				(view, item) -> {
-					@Override
-					public void onItemClick(View view, ContactListItem item) {
 					Intent i = new Intent(getActivity(),
 							ConversationActivity.class);
 					ContactId contactId = item.getContact().getId();
@@ -127,13 +125,12 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 								(ContactListItemViewHolder) list
 										.getRecyclerView()
 										.findViewHolderForAdapterPosition(
-													adapter.findItemPosition(
+												adapter.findItemPosition(item));
-															item));
 						Pair<View, String> avatar =
-									Pair.create((View) holder.avatar,
+								Pair.create(holder.avatar,
 										getTransitionName(holder.avatar));
 						Pair<View, String> bulb =
-									Pair.create((View) holder.bulb,
+								Pair.create(holder.bulb,
 										getTransitionName(holder.bulb));
 						ActivityOptionsCompat options =
 								makeSceneTransitionAnimation(getActivity(),
@@ -144,7 +141,6 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 						// work-around for android bug #224270
 						startActivity(i);
 					}
-					}
 				};
 		adapter = new ContactListAdapter(getContext(), onContactClickListener);
 		list = (BriarRecyclerView) contentView.findViewById(R.id.list);
@@ -196,9 +192,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 
 	private void loadContacts() {
 		final int revision = adapter.getRevision();
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				List<ContactListItem> contacts = new ArrayList<>();
@@ -209,8 +203,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 								conversationManager.getGroupCount(id);
 						boolean connected =
 								connectionRegistry.isConnected(c.getId());
-							contacts.add(new ContactListItem(c, connected,
+						contacts.add(new ContactListItem(c, connected, count));
-									count));
 					} catch (NoSuchContactException e) {
 						// Continue
 					}
@@ -220,18 +213,14 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 					LOG.info("Full load took " + duration + " ms");
 				displayContacts(revision, contacts);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayContacts(final int revision,
 			final List<ContactListItem> contacts) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				if (contacts.isEmpty()) list.showData();
@@ -240,7 +229,6 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 				LOG.info("Concurrent update, reloading");
 				loadContacts();
 			}
-			}
 		});
 	}
 
@@ -295,9 +283,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 	}
 
 	private void updateItem(final ContactId c, final BaseMessageHeader h) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			int position = adapter.findItemPosition(c);
 			ContactListItem item = adapter.getItemAt(position);
@@ -306,26 +292,20 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 				item.addMessage(i);
 				adapter.updateItemAt(position, item);
 			}
-			}
 		});
 	}
 
 	private void removeItem(final ContactId c) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			int position = adapter.findItemPosition(c);
 			ContactListItem item = adapter.getItemAt(position);
 			if (item != null) adapter.remove(item);
-			}
 		});
 	}
 
 	private void setConnected(final ContactId c, final boolean connected) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			int position = adapter.findItemPosition(c);
 			ContactListItem item = adapter.getItemAt(position);
@@ -333,7 +313,6 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 				item.setConnected(connected);
 				adapter.notifyItemChanged(position);
 			}
-			}
 		});
 	}
 

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

@@ -289,9 +289,7 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void loadContactDetailsAndMessages() {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				if (contactName == null || contactAuthorId == null) {
@@ -307,29 +305,22 @@ public class ConversationActivity extends BriarActivity
 			} catch (NoSuchContactException e) {
 				finishOnUiThread();
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayContactDetails() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			//noinspection ConstantConditions
 			toolbarAvatar.setImageDrawable(
 					new IdenticonDrawable(contactAuthorId.getBytes()));
 			toolbarTitle.setText(contactName);
-			}
 		});
 	}
 
 	private void displayContactOnlineStatus() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (connectionRegistry.isConnected(contactId)) {
 				toolbarStatus.setImageDrawable(ContextCompat
 						.getDrawable(ConversationActivity.this,
@@ -343,31 +334,24 @@ public class ConversationActivity extends BriarActivity
 				toolbarStatus
 						.setContentDescription(getString(R.string.offline));
 			}
-			}
 		});
 	}
 
 	private void loadMessages() {
 		final int revision = adapter.getRevision();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Collection<PrivateMessageHeader> headers =
 						messagingManager.getMessageHeaders(contactId);
 				Collection<IntroductionMessage> introductions =
-							introductionManager
+						introductionManager.getIntroductionMessages(contactId);
-									.getIntroductionMessages(contactId);
 				Collection<InvitationMessage> forumInvitations =
-							forumSharingManager
+						forumSharingManager.getInvitationMessages(contactId);
-									.getInvitationMessages(contactId);
 				Collection<InvitationMessage> blogInvitations =
-							blogSharingManager
+						blogSharingManager.getInvitationMessages(contactId);
-									.getInvitationMessages(contactId);
 				Collection<InvitationMessage> groupInvitations =
-							groupInvitationManager
+						groupInvitationManager.getInvitationMessages(contactId);
-									.getInvitationMessages(contactId);
 				List<InvitationMessage> invitations = new ArrayList<>(
 						forumInvitations.size() + blogInvitations.size() +
 								groupInvitations.size());
@@ -377,14 +361,11 @@ public class ConversationActivity extends BriarActivity
 				long duration = System.currentTimeMillis() - now;
 				if (LOG.isLoggable(INFO))
 					LOG.info("Loading messages took " + duration + " ms");
-					displayMessages(revision, headers, introductions,
+				displayMessages(revision, headers, introductions, invitations);
-							invitations);
 			} catch (NoSuchContactException e) {
 				finishOnUiThread();
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -393,9 +374,7 @@ public class ConversationActivity extends BriarActivity
 			final Collection<PrivateMessageHeader> headers,
 			final Collection<IntroductionMessage> introductions,
 			final Collection<InvitationMessage> invitations) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				textInputView.setSendButtonEnabled(true);
@@ -409,7 +388,6 @@ public class ConversationActivity extends BriarActivity
 				LOG.info("Concurrent update, reloading");
 				loadMessages();
 			}
-			}
 		});
 	}
 
@@ -459,9 +437,7 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void loadMessageBody(final MessageId m) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				String body = messagingManager.getMessageBody(m);
@@ -470,17 +446,13 @@ public class ConversationActivity extends BriarActivity
 					LOG.info("Loading body took " + duration + " ms");
 				displayMessageBody(m, body);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayMessageBody(final MessageId m, final String body) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			bodyCache.put(m, body);
 			SparseArray<ConversationItem> messages =
 					adapter.getPrivateMessages();
@@ -493,7 +465,6 @@ public class ConversationActivity extends BriarActivity
 					return;
 				}
 			}
-			}
 		});
 	}
 
@@ -573,14 +544,11 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void addConversationItem(final ConversationItem item) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			adapter.add(item);
 			// Scroll to the bottom
 			list.scrollToPosition(adapter.getItemCount() - 1);
-			}
 		});
 	}
 
@@ -588,24 +556,16 @@ public class ConversationActivity extends BriarActivity
 		getContactNameTask().addListener(new FutureTaskListener<String>() {
 			@Override
 			public void onSuccess(final String contactName) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(() -> {
-					@Override
-					public void run() {
 					ConversationItem item = ConversationItem
-								.from(ConversationActivity.this, contactName,
+							.from(ConversationActivity.this, contactName, m);
-										m);
 					addConversationItem(item);
-					}
 				});
 			}
 			@Override
 			public void onFailure(final Throwable exception) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> handleDbException((DbException) exception));
-					public void run() {
-						handleDbException((DbException) exception);
-					}
-				});
 			}
 		});
 	}
@@ -614,24 +574,16 @@ public class ConversationActivity extends BriarActivity
 		getContactNameTask().addListener(new FutureTaskListener<String>() {
 			@Override
 			public void onSuccess(final String contactName) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(() -> {
-					@Override
-					public void run() {
 					ConversationItem item = ConversationItem
-								.from(ConversationActivity.this, contactName,
+							.from(ConversationActivity.this, contactName, m);
-										m);
 					addConversationItem(item);
-					}
 				});
 			}
 			@Override
 			public void onFailure(final Throwable exception) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> handleDbException((DbException) exception));
-					public void run() {
-						handleDbException((DbException) exception);
-					}
-				});
 			}
 		});
 	}
@@ -640,24 +592,16 @@ public class ConversationActivity extends BriarActivity
 		getContactNameTask().addListener(new FutureTaskListener<String>() {
 			@Override
 			public void onSuccess(final String contactName) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(() -> {
-					@Override
-					public void run() {
 					ConversationItem item = ConversationItem
-								.from(ConversationActivity.this, contactName,
+							.from(ConversationActivity.this, contactName, m);
-										m);
 					addConversationItem(item);
-					}
 				});
 			}
 			@Override
 			public void onFailure(final Throwable exception) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> handleDbException((DbException) exception));
-					public void run() {
-						handleDbException((DbException) exception);
-					}
-				});
 			}
 		});
 	}
@@ -666,33 +610,23 @@ public class ConversationActivity extends BriarActivity
 		getContactNameTask().addListener(new FutureTaskListener<String>() {
 			@Override
 			public void onSuccess(final String contactName) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(() -> {
-					@Override
-					public void run() {
 					ConversationItem item = ConversationItem
-								.from(ConversationActivity.this, contactName,
+							.from(ConversationActivity.this, contactName, m);
-										m);
 					addConversationItem(item);
-					}
 				});
 			}
 			@Override
 			public void onFailure(final Throwable exception) {
-				runOnUiThreadUnlessDestroyed(new Runnable() {
+				runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> handleDbException((DbException) exception));
-					public void run() {
-						handleDbException((DbException) exception);
-					}
-				});
 			}
 		});
 	}
 
 	private void markMessages(final Collection<MessageId> messageIds,
 			final boolean sent, final boolean seen) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			Set<MessageId> messages = new HashSet<>(messageIds);
 			SparseArray<ConversationOutItem> list =
@@ -705,7 +639,6 @@ public class ConversationActivity extends BriarActivity
 					adapter.notifyItemChanged(list.keyAt(i));
 				}
 			}
-			}
 		});
 	}
 
@@ -727,41 +660,31 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void loadGroupId(final String body, final long timestamp) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				messagingGroupId =
 						messagingManager.getConversationId(contactId);
 				createMessage(body, timestamp);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 			}
 
-			}
 		});
 	}
 
 	private void createMessage(final String body, final long timestamp) {
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			try {
 				//noinspection ConstantConditions init in loadGroupId()
 				storeMessage(privateMessageFactory.createPrivateMessage(
 						messagingGroupId, timestamp, body), body);
-				} catch (FormatException e) {
+			} catch (FormatException e) {throw new RuntimeException(e);
-					throw new RuntimeException(e);
-				}
 			}
 		});
 	}
 
 	private void storeMessage(final PrivateMessage m, final String body) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				messagingManager.addLocalMessage(m);
@@ -777,21 +700,14 @@ public class ConversationActivity extends BriarActivity
 				bodyCache.put(message.getId(), body);
 				addConversationItem(item);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void askToRemoveContact() {
 		DialogInterface.OnClickListener okListener =
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> removeContact();
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						removeContact();
-					}
-				};
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(ConversationActivity.this,
 						R.style.BriarDialogTheme);
@@ -803,37 +719,28 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void removeContact() {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				contactManager.removeContact(contactId);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 			} finally {
 				finishAfterContactRemoved();
 			}
-			}
 		});
 	}
 
 	private void finishAfterContactRemoved() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			String deleted = getString(R.string.contact_deleted_toast);
 			Toast.makeText(ConversationActivity.this, deleted, LENGTH_SHORT)
 					.show();
 			supportFinishAfterTransition();
-			}
 		});
 	}
 
 	private void enableIntroductionActionIfAvailable(final MenuItem item) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				if (contactManager.getActiveContacts().size() > 1) {
 					enableIntroductionAction(item);
@@ -845,26 +752,17 @@ public class ConversationActivity extends BriarActivity
 					}
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void enableIntroductionAction(final MenuItem item) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> item.setEnabled(true));
-			@Override
-			public void run() {
-				item.setEnabled(true);
-			}
-		});
 	}
 
 	private void showIntroductionOnboarding() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			// find view of overflow icon
 			View target = null;
 			for (int i = 0; i < toolbar.getChildCount(); i++) {
@@ -899,22 +797,17 @@ public class ConversationActivity extends BriarActivity
 					.setIcon(R.drawable.ic_more_vert_accent)
 					.setOnHidePromptListener(listener)
 					.show();
-			}
 		});
 	}
 
 	private void introductionOnboardingSeen() {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings settings = new Settings();
 				settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false);
 				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -925,9 +818,7 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void markMessageRead(final GroupId g, final MessageId m) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				messagingManager.setReadFlag(g, m, true);
@@ -935,9 +826,7 @@ public class ConversationActivity extends BriarActivity
 				if (LOG.isLoggable(INFO))
 					LOG.info("Marking read took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -951,9 +840,7 @@ public class ConversationActivity extends BriarActivity
 		if (position != INVALID_POSITION) {
 			adapter.notifyItemChanged(position, item);
 		}
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			long timestamp = System.currentTimeMillis();
 			timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
 			try {
@@ -981,7 +868,6 @@ public class ConversationActivity extends BriarActivity
 				if (LOG.isLoggable(WARNING))
 					LOG.log(WARNING, e.toString(), e);
 			}
-			}
 		});
 	}
 
@@ -1041,14 +927,10 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void introductionResponseError() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() ->
-			@Override
-			public void run() {
 				Toast.makeText(ConversationActivity.this,
 						R.string.introduction_response_error,
-						Toast.LENGTH_SHORT).show();
+						Toast.LENGTH_SHORT).show());
-			}
-		});
 	}
 
 	private ListenableFutureTask<String> getContactNameTask() {

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

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.contact;
 
 import android.support.annotation.UiThread;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -35,12 +34,8 @@ class ConversationRequestViewHolder extends ConversationNoticeInViewHolder {
 		if (item.wasAnswered() && item.canBeOpened()) {
 			acceptButton.setVisibility(VISIBLE);
 			acceptButton.setText(R.string.open);
-			acceptButton.setOnClickListener(new OnClickListener() {
+			acceptButton.setOnClickListener(
-				@Override
+					v -> listener.openRequestedShareable(item));
-				public void onClick(View v) {
-					listener.openRequestedShareable(item);
-				}
-			});
 			declineButton.setVisibility(GONE);
 		} else if (item.wasAnswered()) {
 			acceptButton.setVisibility(GONE);
@@ -48,22 +43,16 @@ class ConversationRequestViewHolder extends ConversationNoticeInViewHolder {
 		} else {
 			acceptButton.setVisibility(VISIBLE);
 			acceptButton.setText(R.string.accept);
-			acceptButton.setOnClickListener(new OnClickListener() {
+			acceptButton.setOnClickListener(v -> {
-				@Override
-				public void onClick(View v) {
 				acceptButton.setEnabled(false);
 				declineButton.setEnabled(false);
 				listener.respondToRequest(item, true);
-				}
 			});
 			declineButton.setVisibility(VISIBLE);
-			declineButton.setOnClickListener(new OnClickListener() {
+			declineButton.setOnClickListener(v -> {
-				@Override
-				public void onClick(View v) {
 				acceptButton.setEnabled(false);
 				declineButton.setEnabled(false);
 				listener.respondToRequest(item, false);
-				}
 			});
 		}
 	}

briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorControllerImpl.java

@@ -41,12 +41,9 @@ public abstract class ContactSelectorControllerImpl
 	public void loadContacts(final GroupId g,
 			final Collection<ContactId> selection,
 			final ResultExceptionHandler<Collection<SelectableContactItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
-					Collection<SelectableContactItem> contacts =
+				Collection<SelectableContactItem> contacts = new ArrayList<>();
-							new ArrayList<>();
 				for (Contact c : contactManager.getActiveContacts()) {
 					// was this contact already selected?
 					boolean selected = selection.contains(c.getId());
@@ -57,11 +54,9 @@ public abstract class ContactSelectorControllerImpl
 				}
 				handler.onResult(contacts);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -29,9 +29,7 @@ public class DbControllerImpl implements DbController {
 
 	@Override
 	public void runOnDbThread(final Runnable task) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
-			public void run() {
 			try {
 				lifecycleManager.waitForDatabase();
 				task.run();
@@ -39,7 +37,6 @@ public class DbControllerImpl implements DbController {
 				LOG.warning("Interrupted while waiting for database");
 				Thread.currentThread().interrupt();
 			}
-			}
 		});
 	}
 }

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

@@ -60,14 +60,11 @@ public class SharingControllerImpl implements SharingController, EventListener {
 
 	private void setConnected(final ContactId c) {
 		if (listener == null) return;
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (contacts.contains(c)) {
 				int online = getOnlineCount();
 				listener.onSharingInfoUpdated(contacts.size(), online);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java

@@ -20,12 +20,7 @@ public abstract class UiExceptionHandler<E extends Exception>
 
 	@Override
 	public void onException(final E exception) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> onExceptionUi(exception));
-			@Override
-			public void run() {
-				onExceptionUi(exception);
-			}
-		});
 	}
 
 	@UiThread

briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java

@@ -18,12 +18,7 @@ public abstract class UiResultExceptionHandler<R, E extends Exception>
 
 	@Override
 	public void onResult(final R result) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> onResultUi(result));
-			@Override
-			public void run() {
-				onResultUi(result);
-			}
-		});
 	}
 
 	@UiThread

briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultHandler.java

@@ -14,12 +14,7 @@ public abstract class UiResultHandler<R> implements ResultHandler<R> {
 
 	@Override
 	public void onResult(final R result) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> onResultUi(result));
-			@Override
-			public void run() {
-				onResultUi(result);
-			}
-		});
 	}
 
 	@UiThread

briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java

@@ -5,14 +5,9 @@ import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.db.DbException;
@@ -79,22 +74,13 @@ public class CreateForumActivity extends BriarActivity {
 			public void afterTextChanged(Editable s) {
 			}
 		});
-		nameEntry.setOnEditorActionListener(new OnEditorActionListener() {
+		nameEntry.setOnEditorActionListener((v, actionId, e) -> {
-			@Override
-			public boolean onEditorAction(TextView v, int actionId,
-					KeyEvent e) {
 			createForum();
 			return true;
-			}
 		});
 
 		createForumButton = (Button) findViewById(R.id.createForumButton);
-		createForumButton.setOnClickListener(new OnClickListener() {
+		createForumButton.setOnClickListener(v -> createForum());
-			@Override
-			public void onClick(View v) {
-				createForum();
-			}
-		});
 
 		progress = (ProgressBar) findViewById(R.id.createForumProgressBar);
 	}
@@ -135,9 +121,7 @@ public class CreateForumActivity extends BriarActivity {
 	}
 
 	private void storeForum(final String name) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Forum f = forumManager.addForum(name);
@@ -146,18 +130,14 @@ public class CreateForumActivity extends BriarActivity {
 					LOG.info("Storing forum took " + duration + " ms");
 				displayForum(f);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				finishOnUiThread();
 			}
-			}
 		});
 	}
 
 	private void displayForum(final Forum f) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			Intent i = new Intent(CreateForumActivity.this,
 					ForumActivity.class);
 			i.putExtra(GROUP_ID, f.getId().getBytes());
@@ -166,7 +146,6 @@ public class CreateForumActivity extends BriarActivity {
 			Toast.makeText(CreateForumActivity.this,
 					R.string.forum_created_toast, LENGTH_LONG).show();
 			supportFinishAfterTransition();
-			}
 		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.forum;
 
-import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
@@ -11,7 +10,6 @@ import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.contact.ContactId;
@@ -69,15 +67,11 @@ public class ForumActivity extends
 
 		// Open member list on Toolbar click
 		if (toolbar != null) {
-			toolbar.setOnClickListener(
+			toolbar.setOnClickListener(v -> {
-					new View.OnClickListener() {
+				Intent i1 = new Intent(ForumActivity.this,
-						@Override
-						public void onClick(View v) {
-							Intent i = new Intent(ForumActivity.this,
 						ForumSharingStatusActivity.class);
-							i.putExtra(GROUP_ID, groupId.getBytes());
+				i1.putExtra(GROUP_ID, groupId.getBytes());
-							startActivity(i);
+				startActivity(i1);
-						}
 			});
 		}
 	}
@@ -147,12 +141,7 @@ public class ForumActivity extends
 	}
 
 	private void showUnsubscribeDialog() {
-		OnClickListener okListener = new OnClickListener() {
+		OnClickListener okListener = (dialog, which) -> deleteForum();
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				deleteForum();
-			}
-		};
 		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_leave_forum));

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java

@@ -121,9 +121,7 @@ class ForumControllerImpl extends
 	@Override
 	public void loadSharingContacts(
 			final ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Collection<Contact> contacts =
 						forumSharingManager.getSharedWith(getGroupId());
@@ -132,11 +130,9 @@ class ForumControllerImpl extends
 				for (Contact c : contacts) contactIds.add(c.getId());
 				handler.onResult(contactIds);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -144,9 +140,7 @@ class ForumControllerImpl extends
 	public void createAndStoreMessage(final String body,
 			@Nullable final ForumItem parentItem,
 			final ResultExceptionHandler<ForumItem, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
 				GroupCount count = forumManager.getGroupCount(getGroupId());
@@ -156,26 +150,20 @@ class ForumControllerImpl extends
 						parentItem.getId() : null;
 				createMessage(body, timestamp, parentId, author, handler);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	private void createMessage(final String body, final long timestamp,
 			final @Nullable MessageId parentId, final LocalAuthor author,
 			final ResultExceptionHandler<ForumItem, DbException> handler) {
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			LOG.info("Creating forum post...");
-				ForumPost msg = forumManager
+			ForumPost msg = forumManager.createLocalPost(getGroupId(), body,
-						.createLocalPost(getGroupId(), body, timestamp,
+					timestamp, parentId, author);
-								parentId, author);
 			storePost(msg, body, handler);
-			}
 		});
 	}
 
@@ -197,30 +185,17 @@ class ForumControllerImpl extends
 
 	private void onForumPostReceived(ForumPostHeader h, String body) {
 		final ForumItem item = buildItem(h, body);
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onItemReceived(item));
-			public void run() {
-				listener.onItemReceived(item);
-			}
-		});
 	}
 
 	private void onForumInvitationAccepted(final ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onInvitationAccepted(c));
-			public void run() {
-				listener.onInvitationAccepted(c);
-			}
-		});
 	}
 
 	private void onForumLeft(final ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onForumLeft(c));
-			@Override
-			public void run() {
-				listener.onForumLeft(c);
-			}
-		});
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java

@@ -77,15 +77,12 @@ class ForumListAdapter
 		}
 
 		// Open Forum on Click
-		ui.layout.setOnClickListener(new View.OnClickListener() {
+		ui.layout.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			Intent i = new Intent(ctx, ForumActivity.class);
 			Forum f = item.getForum();
 			i.putExtra(GROUP_ID, f.getId().getBytes());
 			i.putExtra(GROUP_NAME, f.getName());
 			ctx.startActivity(i);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java

@@ -155,9 +155,7 @@ public class ForumListFragment extends BaseEventFragment implements
 
 	private void loadForums() {
 		final int revision = adapter.getRevision();
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Collection<ForumListItem> forums = new ArrayList<>();
@@ -175,18 +173,14 @@ public class ForumListFragment extends BaseEventFragment implements
 					LOG.info("Full load took " + duration + " ms");
 				displayForums(revision, forums);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayForums(final int revision,
 			final Collection<ForumListItem> forums) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				if (forums.isEmpty()) list.showData();
@@ -195,34 +189,26 @@ public class ForumListFragment extends BaseEventFragment implements
 				LOG.info("Concurrent update, reloading");
 				loadForums();
 			}
-			}
 		});
 	}
 
 	private void loadAvailableForums() {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
-					int available =
+				int available = forumSharingManager.getInvitations().size();
-							forumSharingManager.getInvitations().size();
 				long duration = System.currentTimeMillis() - now;
 				if (LOG.isLoggable(INFO))
 					LOG.info("Loading available took " + duration + " ms");
 				displayAvailableForums(available);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayAvailableForums(final int availableCount) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (availableCount == 0) {
 				snackbar.dismiss();
 			} else {
@@ -231,7 +217,6 @@ public class ForumListFragment extends BaseEventFragment implements
 						availableCount));
 				if (!snackbar.isShownOrQueued()) snackbar.show();
 			}
-			}
 		});
 	}
 
@@ -263,9 +248,7 @@ public class ForumListFragment extends BaseEventFragment implements
 	}
 
 	private void updateItem(final GroupId g, final ForumPostHeader m) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			int position = adapter.findItemPosition(g);
 			ForumListItem item = adapter.getItemAt(position);
@@ -273,19 +256,15 @@ public class ForumListFragment extends BaseEventFragment implements
 				item.addHeader(m);
 				adapter.updateItemAt(position, item);
 			}
-			}
 		});
 	}
 
 	private void removeForum(final GroupId g) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			adapter.incrementRevision();
 			int position = adapter.findItemPosition(g);
 			ForumListItem item = adapter.getItemAt(position);
 			if (item != null) adapter.remove(item);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java

@@ -82,15 +82,12 @@ public abstract class BaseFragment extends Fragment
 	public void runOnUiThreadUnlessDestroyed(final Runnable r) {
 		final Activity activity = getActivity();
 		if (activity != null) {
-			activity.runOnUiThread(new Runnable() {
+			activity.runOnUiThread(() -> {
-				@Override
-				public void run() {
 				// Note that we don't have to check if the activity has
 				// been destroyed as the Fragment has not been detached yet
 				if (!isDetached() && !activity.isFinishing()) {
 					r.run();
 				}
-				}
 			});
 		}
 	}

briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java

@@ -1,7 +1,6 @@
 package org.briarproject.briar.android.fragment;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
@@ -35,12 +34,7 @@ public class ScreenFilterDialogFragment extends DialogFragment {
 		builder.setMessage(getString(R.string.screen_filter_body,
 				TextUtils.join("\n", apps)));
 		builder.setNeutralButton(R.string.continue_button,
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> dialog.dismiss());
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						dialog.dismiss();
-					}
-				});
 		return builder.create();
 	}
 }

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

@@ -71,13 +71,10 @@ public class ContactChooserFragment extends BaseFragment {
 		View contentView = inflater.inflate(R.layout.list, container, false);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
-				new OnContactClickListener<ContactListItem>() {
+				(view, item) -> {
-					@Override
-					public void onItemClick(View view, ContactListItem item) {
 					if (c1 == null) throw new IllegalStateException();
 					Contact c2 = item.getContact();
 					showMessageScreen(c1, c2);
-					}
 				};
 		adapter = new ContactListAdapter(getActivity(), onContactClickListener);
 
@@ -115,9 +112,7 @@ public class ContactChooserFragment extends BaseFragment {
 	}
 
 	private void loadContacts() {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				List<ContactListItem> contacts = new ArrayList<>();
 				for (Contact c : contactManager.getActiveContacts()) {
@@ -129,26 +124,20 @@ public class ContactChooserFragment extends BaseFragment {
 								conversationManager.getGroupCount(id);
 						boolean connected =
 								connectionRegistry.isConnected(c.getId());
-							contacts.add(new ContactListItem(c, connected,
+						contacts.add(new ContactListItem(c, connected, count));
-									count));
 					}
 				}
 				displayContacts(contacts);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displayContacts(final List<ContactListItem> contacts) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (contacts.isEmpty()) list.showData();
 			else adapter.addAll(contacts);
-			}
 		});
 	}
 

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

@@ -120,9 +120,7 @@ public class IntroductionMessageFragment extends BaseFragment
 
 	private void prepareToSetUpViews(final int contactId1,
 			final int contactId2) {
-		introductionActivity.runOnDbThread(new Runnable() {
+		introductionActivity.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Contact c1 = contactManager.getContact(
 						new ContactId(contactId1));
@@ -130,17 +128,13 @@ public class IntroductionMessageFragment extends BaseFragment
 						new ContactId(contactId2));
 				setUpViews(c1, c2);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void setUpViews(final Contact c1, final Contact c2) {
-		introductionActivity.runOnUiThreadUnlessDestroyed(new Runnable() {
+		introductionActivity.runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			contact1 = c1;
 			contact2 = c2;
 
@@ -161,7 +155,6 @@ public class IntroductionMessageFragment extends BaseFragment
 			ui.progressBar.setVisibility(GONE);
 			ui.message.setSendButtonEnabled(true);
 			ui.message.showSoftKeyboard();
-			}
 		});
 	}
 
@@ -194,31 +187,22 @@ public class IntroductionMessageFragment extends BaseFragment
 
 	private void makeIntroduction(final Contact c1, final Contact c2,
 			final String msg) {
-		introductionActivity.runOnDbThread(new Runnable() {
+		introductionActivity.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			// actually make the introduction
 			try {
 				long timestamp = System.currentTimeMillis();
-					introductionManager.makeIntroduction(c1, c2, msg,
+				introductionManager.makeIntroduction(c1, c2, msg, timestamp);
-							timestamp);
 			} catch (DbException | FormatException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				introductionError();
 			}
-			}
 		});
 	}
 
 	private void introductionError() {
-		introductionActivity.runOnUiThreadUnlessDestroyed(new Runnable() {
+		introductionActivity.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> Toast.makeText(introductionActivity,
-			public void run() {
+						R.string.introduction_error, LENGTH_SHORT).show());
-				Toast.makeText(introductionActivity,
-						R.string.introduction_error, LENGTH_SHORT).show();
-			}
-		});
 	}
 
 	private static class ViewHolder {

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java

@@ -353,15 +353,11 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 
 	@Override
 	public void surfaceCreated(final SurfaceHolder holder) {
-		post(new Runnable() {
+		post(() -> {
-			@Override
-			public void run() {
 			try {
 				surfaceCreatedUi(holder);
 			} catch (CameraException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -381,15 +377,11 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 	@Override
 	public void surfaceChanged(final SurfaceHolder holder, int format,
 			final int w, final int h) {
-		post(new Runnable() {
+		post(() -> {
-			@Override
-			public void run() {
 			try {
 				surfaceChangedUi(holder, w, h);
 			} catch (CameraException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -420,12 +412,7 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 
 	@Override
 	public void surfaceDestroyed(final SurfaceHolder holder) {
-		post(new Runnable() {
+		post(() -> surfaceDestroyedUi(holder));
-			@Override
-			public void run() {
-				surfaceDestroyedUi(holder);
-			}
-		});
 	}
 
 	@UiThread
@@ -442,12 +429,7 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 	@Override
 	public void onAutoFocus(boolean success, final Camera camera) {
 		LOG.info("Auto focus succeeded: " + success);
-		postDelayed(new Runnable() {
+		postDelayed(this::retryAutoFocus, AUTO_FOCUS_RETRY_DELAY);
-			@Override
-			public void run() {
-				retryAutoFocus();
-			}
-		}, AUTO_FOCUS_RETRY_DELAY);
 	}
 
 	@UiThread

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
@@ -66,24 +65,14 @@ public class IntroFragment extends BaseFragment {
 				false);
 		scrollView = (ScrollView) v.findViewById(R.id.scrollView);
 		View button = v.findViewById(R.id.continueButton);
-		button.setOnClickListener(new OnClickListener() {
+		button.setOnClickListener(view -> screenSeenListener.showNextScreen());
-			@Override
-			public void onClick(View view) {
-				screenSeenListener.showNextScreen();
-			}
-		});
 		return v;
 	}
 
 	@Override
 	public void onStart() {
 		super.onStart();
-		scrollView.post(new Runnable() {
+		scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
-			@Override
-			public void run() {
-				scrollView.fullScroll(FOCUS_DOWN);
-			}
-		});
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.keyagreement;
 
-import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.support.annotation.UiThread;
@@ -144,12 +143,8 @@ public class KeyAgreementActivity extends BriarActivity implements
 			// Should we show an explanation?
 			if (ActivityCompat.shouldShowRequestPermissionRationale(this,
 					CAMERA)) {
-				OnClickListener continueListener = new OnClickListener() {
+				OnClickListener continueListener =
-					@Override
+						(dialog, which) -> requestPermission();
-					public void onClick(DialogInterface dialog, int which) {
-						requestPermission();
-					}
-				};
 				Builder builder = new Builder(this, style.BriarDialogTheme);
 				builder.setTitle(string.permission_camera_title);
 				builder.setMessage(string.permission_camera_request_body);
@@ -183,12 +178,8 @@ public class KeyAgreementActivity extends BriarActivity implements
 				if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
 						CAMERA)) {
 					// The user has permanently denied the request
-					OnClickListener cancelListener = new OnClickListener() {
+					OnClickListener cancelListener =
-						@Override
+							(dialog, which) -> supportFinishAfterTransition();
-						public void onClick(DialogInterface dialog, int which) {
-							supportFinishAfterTransition();
-						}
-					};
 					Builder builder = new Builder(this, style.BriarDialogTheme);
 					builder.setTitle(string.permission_camera_title);
 					builder.setMessage(string.permission_camera_denied_body);
@@ -214,25 +205,17 @@ public class KeyAgreementActivity extends BriarActivity implements
 	}
 
 	private void keyAgreementFinished(final KeyAgreementResult result) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> startContactExchange(result));
-			@Override
-			public void run() {
-				startContactExchange(result);
-			}
-		});
 	}
 
 	private void startContactExchange(final KeyAgreementResult result) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			LocalAuthor localAuthor;
 			// Load the local pseudonym
 			try {
 				localAuthor = identityManager.getLocalAuthor();
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				contactExchangeFailed();
 				return;
 			}
@@ -242,49 +225,37 @@ public class KeyAgreementActivity extends BriarActivity implements
 					localAuthor, result.getMasterKey(),
 					result.getConnection(), result.getTransportId(),
 					result.wasAlice());
-			}
 		});
 	}
 
 	@Override
 	public void contactExchangeSucceeded(final Author remoteAuthor) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			String contactName = remoteAuthor.getName();
-				String format = getString(R.string.contact_added_toast);
+			String format = getString(string.contact_added_toast);
 			String text = String.format(format, contactName);
-				Toast.makeText(KeyAgreementActivity.this, text, LENGTH_LONG)
+			Toast.makeText(KeyAgreementActivity.this, text, LENGTH_LONG).show();
-						.show();
 			supportFinishAfterTransition();
-			}
 		});
 	}
 
 	@Override
 	public void duplicateContact(final Author remoteAuthor) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			String contactName = remoteAuthor.getName();
-				String format = getString(R.string.contact_already_exists);
+			String format = getString(string.contact_already_exists);
 			String text = String.format(format, contactName);
-				Toast.makeText(KeyAgreementActivity.this, text, LENGTH_LONG)
+			Toast.makeText(KeyAgreementActivity.this, text, LENGTH_LONG).show();
-						.show();
 			finish();
-			}
 		});
 	}
 
 	@Override
 	public void contactExchangeFailed() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			Toast.makeText(KeyAgreementActivity.this,
-						R.string.contact_exchange_failed, LENGTH_LONG).show();
+					string.contact_exchange_failed, LENGTH_LONG).show();
 			finish();
-			}
 		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java

@@ -192,23 +192,17 @@ public class ShowQrCodeFragment extends BaseEventFragment
 		final KeyAgreementTask oldTask = task;
 		final KeyAgreementTask newTask = keyAgreementTaskFactory.createTask();
 		task = newTask;
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (oldTask != null) oldTask.stopListening();
 			newTask.listen();
-			}
 		});
 	}
 
 	@UiThread
 	private void stopListening() {
 		final KeyAgreementTask oldTask = task;
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
-			public void run() {
 			if (oldTask != null) oldTask.stopListening();
-			}
 		});
 	}
 
@@ -255,13 +249,9 @@ public class ShowQrCodeFragment extends BaseEventFragment
 			KeyAgreementAbortedEvent event = (KeyAgreementAbortedEvent) e;
 			keyAgreementAborted(event.didRemoteAbort());
 		} else if (e instanceof KeyAgreementFinishedEvent) {
-			runOnUiThreadUnlessDestroyed(new Runnable() {
+			runOnUiThreadUnlessDestroyed(() -> {
-				@Override
-				public void run() {
 				mainProgressContainer.setVisibility(VISIBLE);
-					mainProgressTitle.setText(
+				mainProgressTitle.setText(R.string.exchanging_contact_details);
-							R.string.exchanging_contact_details);
-				}
 			});
 		}
 	}
@@ -297,49 +287,32 @@ public class ShowQrCodeFragment extends BaseEventFragment
 	}
 
 	private void setQrCode(final Payload localPayload) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> generateBitmapQR(localPayload));
-			@Override
-			public void run() {
-				generateBitmapQR(localPayload);
-			}
-		});
 	}
 
 	private void keyAgreementFailed() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			reset();
 			// TODO show failure somewhere persistent?
 			Toast.makeText(getActivity(), R.string.connection_failed,
 					LENGTH_LONG).show();
-			}
 		});
 	}
 
 	private void keyAgreementWaiting() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> status.setText(R.string.waiting_for_contact_to_scan));
-			public void run() {
-				status.setText(R.string.waiting_for_contact_to_scan);
-			}
-		});
 	}
 
 	private void keyAgreementStarted() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			mainProgressContainer.setVisibility(VISIBLE);
 			mainProgressTitle.setText(R.string.authenticating_with_device);
-			}
 		});
 	}
 
 	private void keyAgreementAborted(final boolean remoteAborted) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			reset();
 			mainProgressContainer.setVisibility(INVISIBLE);
 			mainProgressTitle.setText("");
@@ -348,15 +321,12 @@ public class ShowQrCodeFragment extends BaseEventFragment
 					remoteAborted ? R.string.connection_aborted_remote :
 							R.string.connection_aborted_local, LENGTH_LONG)
 					.show();
-			}
 		});
 	}
 
 	@Override
 	public void handleResult(final Result result) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			LOG.info("Got result from decoder");
 			// Ignore results until the KeyAgreementTask is ready
 			if (!gotLocalPayload) {
@@ -366,7 +336,6 @@ public class ShowQrCodeFragment extends BaseEventFragment
 				gotRemotePayload = true;
 				qrCodeScanned(result.getText());
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.login;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -8,13 +7,10 @@ import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
@@ -61,13 +57,9 @@ public class PasswordActivity extends BaseActivity {
 		progress = (ProgressBar) findViewById(R.id.progress_wheel);
 		input = (TextInputLayout) findViewById(R.id.password_layout);
 		password = (EditText) findViewById(R.id.edit_password);
-		password.setOnEditorActionListener(new OnEditorActionListener() {
+		password.setOnEditorActionListener((v, actionId, event) -> {
-			@Override
-			public boolean onEditorAction(TextView v, int actionId,
-					KeyEvent event) {
 			validatePassword();
 			return true;
-			}
 		});
 		password.addTextChangedListener(new TextWatcher() {
 
@@ -131,12 +123,7 @@ public class PasswordActivity extends BaseActivity {
 		builder.setMessage(R.string.dialog_message_lost_password);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.setNegativeButton(R.string.delete,
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> deleteAccount());
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteAccount();
-					}
-				});
 		AlertDialog dialog = builder.create();
 		dialog.show();
 	}

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordControllerImpl.java

@@ -50,9 +50,7 @@ public class PasswordControllerImpl extends ConfigControllerImpl
 	public void validatePassword(final String password,
 			final ResultHandler<Boolean> resultHandler) {
 		final byte[] encrypted = getEncryptedKey();
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			byte[] key = crypto.decryptWithPassword(encrypted, password);
 			if (key == null) {
 				resultHandler.onResult(false);
@@ -60,7 +58,6 @@ public class PasswordControllerImpl extends ConfigControllerImpl
 				databaseConfig.setEncryptionKey(new SecretKey(key));
 				resultHandler.onResult(true);
 			}
-			}
 		});
 	}
 
@@ -68,9 +65,7 @@ public class PasswordControllerImpl extends ConfigControllerImpl
 	public void changePassword(final String password, final String newPassword,
 			final ResultHandler<Boolean> resultHandler) {
 		final byte[] encrypted = getEncryptedKey();
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			byte[] key = crypto.decryptWithPassword(encrypted, password);
 			if (key == null) {
 				resultHandler.onResult(false);
@@ -80,7 +75,6 @@ public class PasswordControllerImpl extends ConfigControllerImpl
 				storeEncryptedDatabaseKey(hex);
 				resultHandler.onResult(true);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java

@@ -86,16 +86,13 @@ public class SetupControllerImpl extends PasswordControllerImpl
 	public void createAccount(final ResultHandler<Void> resultHandler) {
 		if (authorName == null || password == null)
 			throw new IllegalStateException();
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			databaseConfig.setLocalAuthorName(authorName);
 			SecretKey key = crypto.generateSecretKey();
 			databaseConfig.setEncryptionKey(key);
 			String hex = encryptDatabaseKey(key, password);
 			storeEncryptedDatabaseKey(hex);
 			resultHandler.onResult(null);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -307,12 +307,9 @@ public class NavDrawerActivity extends BriarActivity implements
 							daysUntilExpiry, daysUntilExpiry));
 		}
 
-		expiryWarningClose.setOnClickListener(new View.OnClickListener() {
+		expiryWarningClose.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			controller.expiryWarningDismissed();
 			expiryWarning.setVisibility(GONE);
-			}
 		});
 
 		expiryWarning.setVisibility(VISIBLE);
@@ -411,9 +408,7 @@ public class NavDrawerActivity extends BriarActivity implements
 	}
 
 	private void setTransport(final TransportId id, final boolean enabled) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (transports == null || transportsAdapter == null) return;
 			for (Transport t : transports) {
 				if (t.id.equals(id)) {
@@ -422,7 +417,6 @@ public class NavDrawerActivity extends BriarActivity implements
 					break;
 				}
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java

@@ -98,19 +98,13 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 
 	private void transportStateUpdate(final TransportId id,
 			final boolean enabled) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.stateUpdate(id, enabled));
-			public void run() {
-				listener.stateUpdate(id, enabled);
-			}
-		});
 	}
 
 	@Override
 	public void showExpiryWarning(final ResultHandler<ExpiryWarning> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings settings =
 						settingsManager.getSettings(SETTINGS_NAMESPACE);
@@ -141,18 +135,14 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 					}
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	@Override
 	public void expiryWarningDismissed() {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings settings = new Settings();
 				int date = (int) (System.currentTimeMillis() / 1000L);
@@ -160,9 +150,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 				settings.putBoolean(EXPIRY_SHOW_UPDATE, false);
 				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java

@@ -12,7 +12,6 @@ import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.text.TextUtils;
 
@@ -92,14 +91,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 				entryValues.toArray(new CharSequence[entryValues.size()]));
 		panicAppPref.setDefaultValue(Panic.PACKAGE_NAME_NONE);
 
-		panicAppPref.setOnPreferenceChangeListener(
+		panicAppPref.setOnPreferenceChangeListener((preference, newValue) -> {
-				new Preference.OnPreferenceChangeListener() {
-					@Override
-					public boolean onPreferenceChange(Preference preference,
-							Object newValue) {
 			String packageName = (String) newValue;
-						PanicResponder.setTriggerPackageName(getActivity(),
+			PanicResponder.setTriggerPackageName(getActivity(), packageName);
-								packageName);
 			showPanicApp(packageName);
 
 			if (packageName.equals(Panic.PACKAGE_NAME_NONE)) {
@@ -116,26 +110,19 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 			}
 
 			return true;
-					}
 		});
 
 		if (entries.size() <= 1) {
-			panicAppPref.setOnPreferenceClickListener(
+			panicAppPref.setOnPreferenceClickListener(preference -> {
-					new Preference.OnPreferenceClickListener() {
-						@Override
-						public boolean onPreferenceClick(
-								Preference preference) {
 				Intent intent = new Intent(Intent.ACTION_VIEW);
 				intent.setData(Uri.parse(
 						"market://details?id=info.guardianproject.ripple"));
 				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-							if (intent.resolveActivity(
+				if (intent.resolveActivity(getActivity().getPackageManager())
-									getActivity().getPackageManager()) !=
+						!= null) {
-									null) {
 					startActivity(intent);
 				}
 				return true;
-						}
 			});
 		}
 	}
@@ -219,25 +206,14 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 	}
 
 	private void showOptInDialog() {
-		DialogInterface.OnClickListener okListener =
+		DialogInterface.OnClickListener okListener = (dialog, which) -> {
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog,
-							int which) {
 			PanicResponder.setTriggerPackageName(getActivity());
-						showPanicApp(PanicResponder
+			showPanicApp(PanicResponder.getTriggerPackageName(getActivity()));
-								.getTriggerPackageName(getActivity()));
 			getActivity().setResult(Activity.RESULT_OK);
-					}
 		};
-		DialogInterface.OnClickListener cancelListener =
+		DialogInterface.OnClickListener cancelListener = (dialog, which) -> {
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog,
-							int which) {
 			getActivity().setResult(Activity.RESULT_CANCELED);
 			getActivity().finish();
-					}
 		};
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java

@@ -93,9 +93,7 @@ public class PanicResponderActivity extends BriarActivity {
 	}
 
 	private void deleteAllData() {
-		androidExecutor.runOnBackgroundThread(new Runnable() {
+		androidExecutor.runOnBackgroundThread(() -> {
-			@Override
-			public void run() {
 			configController.deleteAccount(PanicResponderActivity.this);
 			// TODO somehow delete/shred the database more thoroughly
 			PanicResponder.deleteAllAppData(PanicResponderActivity.this);
@@ -104,7 +102,6 @@ public class PanicResponderActivity extends BriarActivity {
 			// so still sign out
 			LOG.info("Signing out...");
 			signOut(true);
-			}
 		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java

@@ -11,7 +11,6 @@ import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
@@ -76,15 +75,11 @@ public class GroupActivity extends
 
 		// Open member list on Toolbar click
 		if (toolbar != null) {
-			toolbar.setOnClickListener(
+			toolbar.setOnClickListener(v -> {
-					new View.OnClickListener() {
+				Intent i1 = new Intent(GroupActivity.this,
-						@Override
-						public void onClick(View v) {
-							Intent i = new Intent(GroupActivity.this,
 						GroupMemberListActivity.class);
-							i.putExtra(GROUP_ID, groupId.getBytes());
+				i1.putExtra(GROUP_ID, groupId.getBytes());
-							startActivity(i);
+				startActivity(i1);
-						}
 			});
 		}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java

@@ -85,24 +85,16 @@ class GroupControllerImpl extends
 				LOG.info("Group message received, adding...");
 				final GroupMessageItem item =
 						buildItem(g.getHeader(), g.getBody());
-				listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+				listener.runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> listener.onItemReceived(item));
-					public void run() {
-						listener.onItemReceived(item);
-					}
-				});
 			}
 		} else if (e instanceof ContactRelationshipRevealedEvent) {
 			final ContactRelationshipRevealedEvent c =
 					(ContactRelationshipRevealedEvent) e;
 			if (getGroupId().equals(c.getGroupId())) {
-				listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+				listener.runOnUiThreadUnlessDestroyed(() ->
-					@Override
-					public void run() {
 						listener.onContactRelationshipRevealed(c.getMemberId(),
-								c.getContactId(), c.getVisibility());
+								c.getContactId(), c.getVisibility()));
-					}
-				});
 			}
 		} else if (e instanceof GroupInvitationResponseReceivedEvent) {
 			GroupInvitationResponseReceivedEvent g =
@@ -110,22 +102,14 @@ class GroupControllerImpl extends
 			final GroupInvitationResponse r =
 					(GroupInvitationResponse) g.getResponse();
 			if (getGroupId().equals(r.getShareableId()) && r.wasAccepted()) {
-				listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+				listener.runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> listener.onInvitationAccepted(r.getContactId()));
-					public void run() {
-						listener.onInvitationAccepted(r.getContactId());
-					}
-				});
 			}
 		} else if (e instanceof GroupDissolvedEvent) {
 			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
 			if (getGroupId().equals(g.getGroupId())) {
-				listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+				listener.runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> listener.onGroupDissolved());
-					public void run() {
-						listener.onGroupDissolved();
-					}
-				});
 			}
 		}
 	}
@@ -158,9 +142,7 @@ class GroupControllerImpl extends
 	@Override
 	public void loadSharingContacts(
 			final ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Collection<GroupMember> members =
 						privateGroupManager.getMembers(getGroupId());
@@ -171,11 +153,9 @@ class GroupControllerImpl extends
 				}
 				handler.onResult(contactIds);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -183,9 +163,7 @@ class GroupControllerImpl extends
 	public void createAndStoreMessage(final String body,
 			@Nullable final GroupMessageItem parentItem,
 			final ResultExceptionHandler<GroupMessageItem, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
 				MessageId parentId = null;
@@ -196,14 +174,12 @@ class GroupControllerImpl extends
 				long timestamp = count.getLatestMsgTime();
 				if (parentItem != null) parentId = parentItem.getId();
 				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
-					createMessage(body, timestamp, parentId, author,
+				createMessage(body, timestamp, parentId, author, previousMsgId,
-							previousMsgId, handler);
+						handler);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -211,15 +187,12 @@ class GroupControllerImpl extends
 			final @Nullable MessageId parentId, final LocalAuthor author,
 			final MessageId previousMsgId,
 			final ResultExceptionHandler<GroupMessageItem, DbException> handler) {
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			LOG.info("Creating group message...");
 			GroupMessage msg = groupMessageFactory
 					.createGroupMessage(getGroupId(), timestamp,
 							parentId, author, body, previousMsgId);
 			storePost(msg, body, handler);
-			}
 		});
 	}
 
@@ -246,37 +219,29 @@ class GroupControllerImpl extends
 	@Override
 	public void loadLocalAuthor(
 			final ResultExceptionHandler<LocalAuthor, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
 				handler.onResult(author);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	@Override
 	public void isDissolved(final
 	ResultExceptionHandler<Boolean, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				boolean isDissolved =
 						privateGroupManager.isDissolved(getGroupId());
 				handler.onResult(isDissolved);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java

@@ -76,55 +76,44 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 	@Override
 	public void createGroup(final String name,
 			final ResultExceptionHandler<GroupId, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
 				createGroupAndMessages(author, name, handler);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	private void createGroupAndMessages(final LocalAuthor author,
 			final String name,
 			final ResultExceptionHandler<GroupId, DbException> handler) {
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			LOG.info("Creating group...");
 			PrivateGroup group =
 					groupFactory.createPrivateGroup(name, author);
 			LOG.info("Creating new join announcement...");
-				GroupMessage joinMsg = groupMessageFactory
+			GroupMessage joinMsg =
-						.createJoinMessage(group.getId(),
+					groupMessageFactory.createJoinMessage(group.getId(),
 							clock.currentTimeMillis(), author);
 			storeGroup(group, joinMsg, handler);
-			}
 		});
 	}
 
 	private void storeGroup(final PrivateGroup group,
 			final GroupMessage joinMsg,
 			final ResultExceptionHandler<GroupId, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			LOG.info("Adding group to database...");
 			try {
 				groupManager.addPrivateGroup(group, joinMsg, true);
 				handler.onResult(group.getId());
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -137,9 +126,7 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 	public void sendInvitation(final GroupId g,
 			final Collection<ContactId> contactIds, final String message,
 			final ResultExceptionHandler<Void, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				LocalAuthor localAuthor = identityManager.getLocalAuthor();
 				List<Contact> contacts = new ArrayList<>();
@@ -152,39 +139,32 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 				}
 				signInvitations(g, localAuthor, contacts, message, handler);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	private void signInvitations(final GroupId g, final LocalAuthor localAuthor,
 			final Collection<Contact> contacts, final String message,
 			final ResultExceptionHandler<Void, DbException> handler) {
-		cryptoExecutor.execute(new Runnable() {
+		cryptoExecutor.execute(() -> {
-			@Override
-			public void run() {
 			long timestamp = clock.currentTimeMillis();
 			List<InvitationContext> contexts = new ArrayList<>();
 			for (Contact c : contacts) {
-					byte[] signature = groupInvitationFactory.signInvitation(c,
+				byte[] signature = groupInvitationFactory.signInvitation(c, g,
-							g, timestamp, localAuthor.getPrivateKey());
+						timestamp, localAuthor.getPrivateKey());
 				contexts.add(new InvitationContext(c.getId(), timestamp,
 						signature));
 			}
 			sendInvitations(g, contexts, message, handler);
-			}
 		});
 	}
 
 	private void sendInvitations(final GroupId g,
 			final Collection<InvitationContext> contexts, final String message,
 			final ResultExceptionHandler<Void, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				String msg = message.isEmpty() ? null : message;
 				for (InvitationContext context : contexts) {
@@ -199,11 +179,9 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 				//noinspection ConstantConditions
 				handler.onResult(null);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java

@@ -5,16 +5,12 @@ import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 
 import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.R;
@@ -65,24 +61,15 @@ public class CreateGroupFragment extends BaseFragment {
 			public void afterTextChanged(Editable s) {
 			}
 		});
-		nameEntry.setOnEditorActionListener(new OnEditorActionListener() {
+		nameEntry.setOnEditorActionListener((v1, actionId, e) -> {
-			@Override
-			public boolean onEditorAction(TextView v, int actionId,
-					KeyEvent e) {
 			createGroup();
 			return true;
-			}
 		});
 
 		nameLayout = (TextInputLayout) v.findViewById(R.id.nameLayout);
 
 		createGroupButton = (Button) v.findViewById(R.id.button);
-		createGroupButton.setOnClickListener(new OnClickListener() {
+		createGroupButton.setOnClickListener(v1 -> createGroup());
-			@Override
-			public void onClick(View v) {
-				createGroup();
-			}
-		});
 
 		progress = (ProgressBar) v.findViewById(R.id.progressBar);
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationControllerImpl.java

@@ -67,19 +67,15 @@ class GroupInvitationControllerImpl
 	public void respondToInvitation(final GroupInvitationItem item,
 			final boolean accept,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				PrivateGroup g = item.getShareable();
 				ContactId c = item.getCreator().getId();
 				groupInvitationManager.respondToInvitation(c, g, accept);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListControllerImpl.java

@@ -120,56 +120,32 @@ class GroupListControllerImpl extends DbControllerImpl
 	}
 
 	private void onGroupMessageAdded(final GroupMessageHeader h) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onGroupMessageAdded(h));
-			public void run() {
-				listener.onGroupMessageAdded(h);
-			}
-		});
 	}
 
 	private void onGroupInvitationReceived() {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onGroupInvitationReceived());
-			public void run() {
-				listener.onGroupInvitationReceived();
-			}
-		});
 	}
 
 	private void onGroupAdded(final GroupId g) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onGroupAdded(g));
-			@Override
-			public void run() {
-				listener.onGroupAdded(g);
-			}
-		});
 	}
 
 	private void onGroupRemoved(final GroupId g) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onGroupRemoved(g));
-			@Override
-			public void run() {
-				listener.onGroupRemoved(g);
-			}
-		});
 	}
 
 	private void onGroupDissolved(final GroupId g) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onGroupDissolved(g));
-			public void run() {
-				listener.onGroupDissolved(g);
-			}
-		});
 	}
 
 	@Override
 	public void loadGroups(
 			final ResultExceptionHandler<Collection<GroupItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				Collection<PrivateGroup> groups =
@@ -190,20 +166,16 @@ class GroupListControllerImpl extends DbControllerImpl
 					LOG.info("Loading groups took " + duration + " ms");
 				handler.onResult(items);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	@Override
 	public void removeGroup(final GroupId g,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				groupManager.removePrivateGroup(g);
@@ -211,29 +183,23 @@ class GroupListControllerImpl extends DbControllerImpl
 				if (LOG.isLoggable(INFO))
 					LOG.info("Removing group took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
 	@Override
 	public void loadAvailableGroups(
 			final ResultExceptionHandler<Integer, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				handler.onResult(
 						groupInvitationManager.getInvitations().size());
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
@@ -107,25 +106,17 @@ class GroupViewHolder extends RecyclerView.ViewHolder {
 			status
 					.setText(ctx.getString(R.string.groups_group_is_dissolved));
 			status.setVisibility(VISIBLE);
-			remove.setOnClickListener(new OnClickListener() {
+			remove.setOnClickListener(v -> listener.onGroupRemoveClick(group));
-				@Override
-				public void onClick(View v) {
-					listener.onGroupRemoveClick(group);
-				}
-			});
 			remove.setVisibility(VISIBLE);
 		}
 
 		// Open Group on Click
-		layout.setOnClickListener(new OnClickListener() {
+		layout.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			Intent i = new Intent(ctx, GroupActivity.class);
 			GroupId id = group.getId();
 			i.putExtra(GROUP_ID, id.getBytes());
 			i.putExtra(GROUP_NAME, group.getName());
 			ctx.startActivity(i);
-			}
 		});
 	}
 

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

@@ -42,9 +42,7 @@ class GroupMemberListControllerImpl extends DbControllerImpl
 	@Override
 	public void loadMembers(final GroupId groupId, final
 			ResultExceptionHandler<Collection<MemberListItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Collection<MemberListItem> items = new ArrayList<>();
 				Collection<GroupMember> members =
@@ -58,11 +56,9 @@ class GroupMemberListControllerImpl extends DbControllerImpl
 				}
 				handler.onResult(items);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.privategroup.reveal;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
@@ -110,19 +109,8 @@ public class RevealContactsActivity extends ContactSelectorActivity
 		new AlertDialog.Builder(this, R.style.OnboardingDialogTheme)
 				.setMessage(getString(R.string.groups_reveal_dialog_message))
 				.setNeutralButton(R.string.got_it,
-						new DialogInterface.OnClickListener() {
+						(dialog, which) -> dialog.cancel())
-							@Override
+				.setOnCancelListener(dialog -> onboardingShown())
-							public void onClick(DialogInterface dialog,
-									int which) {
-								dialog.cancel();
-							}
-						})
-				.setOnCancelListener(new DialogInterface.OnCancelListener() {
-					@Override
-					public void onCancel(DialogInterface dialog) {
-						onboardingShown();
-					}
-				})
 				.show();
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java

@@ -62,19 +62,13 @@ class RevealContactsControllerImpl extends DbControllerImpl
 	public void loadContacts(final GroupId g,
 			final Collection<ContactId> selection,
 			final ResultExceptionHandler<Collection<RevealableContactItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
-					Collection<RevealableContactItem> items =
+				handler.onResult(getItems(g, selection));
-							getItems(g, selection);
-					handler.onResult(items);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -105,9 +99,7 @@ class RevealContactsControllerImpl extends DbControllerImpl
 	@Override
 	public void isOnboardingNeeded(
 			final ResultExceptionHandler<Boolean, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings settings =
 						settingsManager.getSettings(SETTINGS_NAMESPACE);
@@ -115,20 +107,16 @@ class RevealContactsControllerImpl extends DbControllerImpl
 						settings.getBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS,
 								true));
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
 
-			}
 		});
 	}
 
 	@Override
 	public void onboardingShown(ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings settings = new Settings();
 				settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false);
@@ -137,16 +125,13 @@ class RevealContactsControllerImpl extends DbControllerImpl
 				if (LOG.isLoggable(WARNING))
 					LOG.log(WARNING, e.toString(), e);
 			}
-			}
 		});
 	}
 
 	@Override
 	public void reveal(final GroupId g, final Collection<ContactId> contacts,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			for (ContactId c : contacts) {
 				try {
 					groupInvitationManager.revealRelationship(c, g);
@@ -161,7 +146,6 @@ class RevealContactsControllerImpl extends DbControllerImpl
 					break;
 				}
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java

@@ -256,12 +256,9 @@ public class BriarReportPrimer implements ReportPrimer {
 			Looper.prepare();
 			Handler handler = new Handler();
 			handler.post(runnable);
-			handler.post(new Runnable() {
+			handler.post(() -> {
-				@Override
-				public void run() {
 				Looper looper = Looper.myLooper();
 				if (looper != null) looper.quit();
-				}
 			});
 			Looper.loop();
 		}

briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.reporting;
 
-import android.content.Context;
 import android.content.res.Configuration;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -37,6 +36,7 @@ import java.util.logging.Logger;
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
+import static android.view.inputmethod.InputMethodManager.SHOW_FORCED;
 import static java.util.logging.Level.WARNING;
 import static org.acra.ACRAConstants.EXTRA_REPORT_FILE;
 import static org.acra.ReportField.ANDROID_VERSION;
@@ -115,28 +115,14 @@ public class DevReportActivity extends BaseCrashReportDialog
 			includeDebugReport.setChecked(true);
 		}
 
-		findViewById(R.id.acceptButton).setOnClickListener(
+		findViewById(R.id.acceptButton).setOnClickListener(v -> {
-				new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
 			reviewing = true;
 			requestReport.setVisibility(GONE);
-						((InputMethodManager) getSystemService(
+			((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
-								Context.INPUT_METHOD_SERVICE))
+					.showSoftInput(userCommentView, SHOW_FORCED);
-								.showSoftInput(userCommentView,
-										InputMethodManager.SHOW_FORCED);
-					}
 		});
-		findViewById(R.id.declineButton).setOnClickListener(
+		findViewById(R.id.declineButton).setOnClickListener(v -> closeReport());
-				new View.OnClickListener() {
+		chevron.setOnClickListener(v -> {
-					@Override
-					public void onClick(View v) {
-						closeReport();
-					}
-				});
-		chevron.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
 			boolean show =
 					chevron.getText().equals(getString(R.string.show));
 			if (show) {
@@ -146,7 +132,6 @@ public class DevReportActivity extends BaseCrashReportDialog
 				chevron.setText(R.string.show);
 				report.setVisibility(GONE);
 			}
-			}
 		});
 
 		if (state != null)

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

@@ -141,22 +141,16 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			notifyLockscreen.setVisible(true);
 			notifyLockscreen.setOnPreferenceChangeListener(this);
 		}
-		notifySound.setOnPreferenceClickListener(
+		notifySound.setOnPreferenceClickListener(preference -> {
-				new Preference.OnPreferenceClickListener() {
+			String title = getString(R.string.choose_ringtone_title);
-					@Override
-					public boolean onPreferenceClick(Preference preference) {
-						String title =
-								getString(R.string.choose_ringtone_title);
 			Intent i = new Intent(ACTION_RINGTONE_PICKER);
 			i.putExtra(EXTRA_RINGTONE_TYPE, TYPE_NOTIFICATION);
 			i.putExtra(EXTRA_RINGTONE_TITLE, title);
-						i.putExtra(EXTRA_RINGTONE_DEFAULT_URI,
+			i.putExtra(EXTRA_RINGTONE_DEFAULT_URI, DEFAULT_NOTIFICATION_URI);
-								DEFAULT_NOTIFICATION_URI);
 			i.putExtra(EXTRA_RINGTONE_SHOW_SILENT, true);
 			if (settings.getBoolean(PREF_NOTIFY_SOUND, true)) {
 				Uri uri;
-							String ringtoneUri =
+				String ringtoneUri = settings.get(PREF_NOTIFY_RINGTONE_URI);
-									settings.get(PREF_NOTIFY_RINGTONE_URI);
 				if (StringUtils.isNullOrEmpty(ringtoneUri))
 					uri = DEFAULT_NOTIFICATION_URI;
 				else uri = Uri.parse(ringtoneUri);
@@ -164,30 +158,21 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			}
 			startActivityForResult(i, REQUEST_RINGTONE);
 			return true;
-					}
 		});
 
 		findPreference("pref_key_send_feedback").setOnPreferenceClickListener(
-				new Preference.OnPreferenceClickListener() {
+				preference -> {
-					@Override
-					public boolean onPreferenceClick(Preference preference) {
 					triggerFeedback();
 					return true;
-					}
 				});
 
 		Preference testData = findPreference("pref_key_test_data");
 		if (IS_DEBUG_BUILD) {
-			testData.setOnPreferenceClickListener(
+			testData.setOnPreferenceClickListener(preference -> {
-					new Preference.OnPreferenceClickListener() {
-						@Override
-						public boolean onPreferenceClick(
-								Preference preference) {
 				LOG.info("Creating test data");
 				testDataCreator.createTestData();
 				getActivity().finish();
 				return true;
-						}
 			});
 		} else {
 			testData.setVisible(false);
@@ -209,14 +194,11 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	}
 
 	private void loadSettings() {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-					Settings btSettings =
+				Settings btSettings = settingsManager.getSettings(BT_NAMESPACE);
-							settingsManager.getSettings(BT_NAMESPACE);
 				Settings torSettings =
 						settingsManager.getSettings(TOR_NAMESPACE);
 				long duration = System.currentTimeMillis() - now;
@@ -228,18 +210,14 @@ public class SettingsFragment extends PreferenceFragmentCompat
 						PREF_TOR_NETWORK_ALWAYS);
 				displaySettings(btSetting, torSetting);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displaySettings(final boolean btSetting,
 			final int torSetting) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			enableBluetooth.setValue(Boolean.toString(btSetting));
 			torNetwork.setValue(Integer.toString(torSetting));
 
@@ -263,8 +241,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
 			String text;
 			if (settings.getBoolean(PREF_NOTIFY_SOUND, true)) {
-					String ringtoneName =
+				String ringtoneName = settings.get(PREF_NOTIFY_RINGTONE_NAME);
-							settings.get(PREF_NOTIFY_RINGTONE_NAME);
 				if (StringUtils.isNullOrEmpty(ringtoneName)) {
 					text = getString(R.string.notify_sound_setting_default);
 				} else {
@@ -274,18 +251,12 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				text = getString(R.string.notify_sound_setting_disabled);
 			}
 			notifySound.setSummary(text);
-			}
 		});
 	}
 
 	private void triggerFeedback() {
-		androidExecutor.runOnBackgroundThread(new Runnable() {
+		androidExecutor.runOnBackgroundThread(() -> ACRA.getErrorReporter()
-			@Override
+				.handleException(new UserFeedback(), false));
-			public void run() {
-				ACRA.getErrorReporter().handleException(new UserFeedback(),
-						false);
-			}
-		});
 	}
 
 	@Override
@@ -331,9 +302,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	}
 
 	private void storeTorSettings(final int torSetting) {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings s = new Settings();
 				s.putInt(PREF_TOR_NETWORK, torSetting);
@@ -343,17 +312,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				if (LOG.isLoggable(INFO))
 					LOG.info("Merging settings took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void storeBluetoothSettings(final boolean btSetting) {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Settings s = new Settings();
 				s.putBoolean(PREF_BT_ENABLE, btSetting);
@@ -363,17 +328,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				if (LOG.isLoggable(INFO))
 					LOG.info("Merging settings took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void storeSettings(final Settings settings) {
-		listener.runOnDbThread(new Runnable() {
+		listener.runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
@@ -381,9 +342,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				if (LOG.isLoggable(INFO))
 					LOG.info("Merging settings took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}

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

@@ -61,9 +61,7 @@ class BlogInvitationControllerImpl
 	public void respondToInvitation(final SharingInvitationItem item,
 			final boolean accept,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Blog f = (Blog) item.getShareable();
 				for (Contact c : item.getNewSharers()) {
@@ -71,11 +69,9 @@ class BlogInvitationControllerImpl
 					blogSharingManager.respondToInvitation(f, c, accept);
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -62,9 +62,7 @@ class ForumInvitationControllerImpl
 	public void respondToInvitation(final SharingInvitationItem item,
 			final boolean accept,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				Forum f = (Forum) item.getShareable();
 				for (Contact c : item.getNewSharers()) {
@@ -72,11 +70,9 @@ class ForumInvitationControllerImpl
 					forumSharingManager.respondToInvitation(f, c, accept);
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -123,9 +123,7 @@ public abstract class InvitationActivity<I extends InvitationItem>
 
 	protected void displayInvitations(final int revision,
 			final Collection<I> invitations, final boolean clear) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (invitations.isEmpty()) {
 				LOG.info("No more invitations available, finishing");
 				supportFinishAfterTransition();
@@ -137,7 +135,6 @@ public abstract class InvitationActivity<I extends InvitationItem>
 				LOG.info("Concurrent update, reloading");
 				loadInvitations(clear);
 			}
-			}
 		});
 	}
 

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

@@ -93,24 +93,19 @@ public abstract class InvitationControllerImpl<I extends InvitationItem>
 	@Override
 	public void loadInvitations(final boolean clear,
 			final ResultExceptionHandler<Collection<I>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			Collection<I> invitations = new ArrayList<>();
 			try {
 				long now = System.currentTimeMillis();
 				invitations.addAll(getInvitations());
 				long duration = System.currentTimeMillis() - now;
 				if (LOG.isLoggable(INFO))
-						LOG.info(
+					LOG.info("Loading invitations took " + duration + " ms");
-								"Loading invitations took " + duration + " ms");
 				handler.onResult(invitations);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -53,18 +53,8 @@ public class InvitationViewHolder<I extends InvitationItem>
 			subscribed.setVisibility(GONE);
 		}
 
-		accept.setOnClickListener(new View.OnClickListener() {
+		accept.setOnClickListener(v -> listener.onItemClick(item, true));
-			@Override
+		decline.setOnClickListener(v -> listener.onItemClick(item, false));
-			public void onClick(View v) {
-				listener.onItemClick(item, true);
-			}
-		});
-		decline.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				listener.onItemClick(item, false);
-			}
-		});
 	}
 
 }

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

@@ -58,9 +58,7 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl
 	public void share(final GroupId g, final Collection<ContactId> contacts,
 			final String message,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				String msg = isNullOrEmpty(message) ? null : message;
 				for (ContactId c : contacts) {
@@ -75,11 +73,9 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl
 					}
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -58,9 +58,7 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl
 	public void share(final GroupId g, final Collection<ContactId> contacts,
 			final String message,
 			final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				String msg = isNullOrEmpty(message) ? null : message;
 				for (ContactId c : contacts) {
@@ -75,11 +73,9 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl
 					}
 				}
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

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

@@ -100,33 +100,25 @@ abstract class SharingStatusActivity extends BriarActivity {
 	}
 
 	private void loadSharedWith() {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				List<ContactItem> contactItems = new ArrayList<>();
 				for (Contact c : getSharedWith()) {
-						boolean online =
+					boolean online = connectionRegistry.isConnected(c.getId());
-								connectionRegistry.isConnected(c.getId());
 					ContactItem item = new ContactItem(c, online);
 					contactItems.add(item);
 				}
 				displaySharedWith(contactItems);
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
 	private void displaySharedWith(final List<ContactItem> contacts) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
-			public void run() {
 			if (contacts.isEmpty()) list.showData();
 			else adapter.addAll(contacts);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java

@@ -43,12 +43,9 @@ public class SplashScreenActivity extends BaseActivity {
 
 		setContentView(R.layout.splash);
 
-		new Handler().postDelayed(new Runnable() {
+		new Handler().postDelayed(() -> {
-			@Override
-			public void run() {
 			startNextActivity();
 			supportFinishAfterTransition();
-			}
 		}, 500);
 	}
 
@@ -72,12 +69,8 @@ public class SplashScreenActivity extends BaseActivity {
 	}
 
 	private void setPreferencesDefaults() {
-		androidExecutor.runOnBackgroundThread(new Runnable() {
+		androidExecutor.runOnBackgroundThread(() ->
-			@Override
-			public void run() {
 				PreferenceManager.setDefaultValues(SplashScreenActivity.this,
-						R.xml.panic_preferences, false);
+						R.xml.panic_preferences, false));
-			}
-		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java

@@ -85,13 +85,8 @@ public abstract class BaseThreadItemViewHolder<I extends ThreadItem>
 			public void onAnimationRepeat(Animator animation) {
 			}
 		});
-		anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+		anim.addUpdateListener(valueAnimator -> layout.setBackgroundColor(
-			@Override
+				(Integer) valueAnimator.getAnimatedValue()));
-			public void onAnimationUpdate(ValueAnimator valueAnimator) {
-				layout.setBackgroundColor(
-						(Integer) valueAnimator.getAnimatedValue());
-			}
-		});
 		anim.setDuration(ANIMATION_DURATION);
 		anim.start();
 	}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java

@@ -10,7 +10,6 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
-import android.view.View;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
@@ -117,23 +116,17 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 				});
 		upButton = (UnreadMessageButton) findViewById(R.id.upButton);
 		downButton = (UnreadMessageButton) findViewById(R.id.downButton);
-		upButton.setOnClickListener(new View.OnClickListener() {
+		upButton.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			int position = adapter.getVisibleUnreadPosTop();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
-			}
 		});
-		downButton.setOnClickListener(new View.OnClickListener() {
+		downButton.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			int position = adapter.getVisibleUnreadPosBottom();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
-			}
 		});
 
 		if (state != null) {

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java

@@ -101,17 +101,13 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 	public void onActivityDestroy() {
 		final MessageId messageId = listener.getFirstVisibleMessageId();
 		if (messageId != null) {
-			dbExecutor.execute(new Runnable() {
+			dbExecutor.execute(() -> {
-				@Override
-				public void run() {
 				try {
-						messageTracker
+					messageTracker.storeMessageId(groupId, messageId);
-								.storeMessageId(groupId, messageId);
 				} catch (DbException e) {
 					if (LOG.isLoggable(WARNING))
 						LOG.log(WARNING, e.toString(), e);
 				}
-				}
 			});
 		}
 	}
@@ -123,12 +119,8 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 			GroupRemovedEvent s = (GroupRemovedEvent) e;
 			if (s.getGroup().getId().equals(getGroupId())) {
 				LOG.info("Group removed");
-				listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+				listener.runOnUiThreadUnlessDestroyed(
-					@Override
+						() -> listener.onGroupRemoved());
-					public void run() {
-						listener.onGroupRemoved();
-					}
-				});
 			}
 		}
 	}
@@ -137,9 +129,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 	public void loadNamedGroup(
 			final ResultExceptionHandler<G, DbException> handler) {
 		checkGroupId();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				G groupItem = loadNamedGroup();
@@ -152,7 +142,6 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 					LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -163,9 +152,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 	public void loadItems(
 			final ResultExceptionHandler<ThreadItemList<I>, DbException> handler) {
 		checkGroupId();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				// Load headers
 				long now = System.currentTimeMillis();
@@ -189,11 +176,9 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 				// Build and hand over items
 				handler.onResult(buildItems(headers));
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -210,9 +195,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 
 	@Override
 	public void markItemsRead(final Collection<I> items) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				for (I i : items) {
@@ -222,9 +205,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 				if (LOG.isLoggable(INFO))
 					LOG.info("Marking read took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
@@ -234,9 +215,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 
 	protected void storePost(final M msg, final String body,
 			final ResultExceptionHandler<I, DbException> resultHandler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				H header = addLocalMessage(msg);
@@ -246,11 +225,9 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 					LOG.info("Storing message took " + duration + " ms");
 				resultHandler.onResult(buildItem(header, body));
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				resultHandler.onException(e);
 			}
-			}
 		});
 	}
 
@@ -259,9 +236,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 
 	@Override
 	public void deleteNamedGroup(final ExceptionHandler<DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
-			public void run() {
 			try {
 				long now = System.currentTimeMillis();
 				G groupItem = loadNamedGroup();
@@ -270,11 +245,9 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
 				if (LOG.isLoggable(INFO))
 					LOG.info("Removing group took " + duration + " ms");
 			} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-						LOG.log(WARNING, e.toString(), e);
 				handler.onException(e);
 			}
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java

@@ -50,12 +50,7 @@ public class ThreadPostViewHolder<I extends ThreadItem>
 			lvlText.setVisibility(GONE);
 		}
 
-		replyButton.setOnClickListener(new View.OnClickListener() {
+		replyButton.setOnClickListener(v -> listener.onReplyClick(item));
-			@Override
-			public void onClick(View v) {
-				listener.onReplyClick(item);
-			}
-		});
 	}
 
 }

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

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.util;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.net.Uri;
@@ -143,16 +142,13 @@ public class UiUtils {
 
 	public static OnClickListener getGoToSettingsListener(
 			final Context context) {
-		return new OnClickListener() {
+		return (dialog, which) -> {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
 			Intent i = new Intent();
 			i.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
 			i.addCategory(CATEGORY_DEFAULT);
 			i.setData(Uri.parse("package:" + APPLICATION_ID));
 			i.addFlags(FLAG_ACTIVITY_NEW_TASK);
 			context.startActivity(i);
-			}
 		};
 	}
 
@@ -160,13 +156,7 @@ public class UiUtils {
 		new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme)
 				.setMessage(text)
 				.setNeutralButton(R.string.got_it,
-						new DialogInterface.OnClickListener() {
+						(dialog, which) -> dialog.cancel())
-							@Override
-							public void onClick(DialogInterface dialog,
-									int which) {
-								dialog.cancel();
-							}
-						})
 				.show();
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java

@@ -94,22 +94,11 @@ public class BriarRecyclerView extends FrameLayout {
 	}
 
 	private void addLayoutChangeListener() {
-		recyclerView.addOnLayoutChangeListener(
+		recyclerView.addOnLayoutChangeListener((v, left, top, right, bottom,
-				new OnLayoutChangeListener() {
+				oldLeft, oldTop, oldRight, oldBottom) -> {
-					@Override
-					public void onLayoutChange(View v, int left, int top,
-							int right, int bottom, int oldLeft, int oldTop,
-							int oldRight, int oldBottom) {
 			if (bottom < oldBottom) {
-							recyclerView.postDelayed(new Runnable() {
+				recyclerView.postDelayed(() -> scrollToPosition(
-								@Override
+						recyclerView.getAdapter().getItemCount() - 1), 100);
-								public void run() {
-									scrollToPosition(
-											recyclerView.getAdapter()
-													.getItemCount() - 1);
-								}
-							}, 100);
-						}
 			}
 		});
 	}
@@ -191,14 +180,11 @@ public class BriarRecyclerView extends FrameLayout {
 		if (recyclerView == null || recyclerView.getAdapter() == null) {
 			throw new IllegalStateException("Need to call setAdapter() first!");
 		}
-		refresher = new Runnable() {
+		refresher = () -> {
-			@Override
-			public void run() {
 			LOG.info("Updating Content...");
 			Adapter adapter = recyclerView.getAdapter();
 			adapter.notifyItemRangeChanged(0, adapter.getItemCount());
 			handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
-			}
 		};
 		LOG.info("Adding Handler Callback");
 		handler.postDelayed(refresher, MIN_DATE_RESOLUTION);

briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java

@@ -75,35 +75,19 @@ public class TextInputView extends KeyboardAwareLinearLayout
 		}
 
 		ui.emojiToggle.attach(ui.emojiDrawer);
-		ui.emojiToggle.setOnClickListener(new OnClickListener() {
+		ui.emojiToggle.setOnClickListener(v -> onEmojiToggleClicked());
-			@Override
+		ui.editText.setOnClickListener(v -> showSoftKeyboard());
-			public void onClick(View v) {
+		ui.editText.setOnKeyListener((v, keyCode, event) -> {
-				onEmojiToggleClicked();
-			}
-		});
-		ui.editText.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				showSoftKeyboard();
-			}
-		});
-		ui.editText.setOnKeyListener(new OnKeyListener() {
-			@Override
-			public boolean onKey(View v, int keyCode, KeyEvent event) {
 			if (keyCode == KEYCODE_BACK && isEmojiDrawerOpen()) {
 				hideEmojiDrawer();
 				return true;
 			}
 			return false;
-			}
 		});
-		ui.sendButton.setOnClickListener(new OnClickListener() {
+		ui.sendButton.setOnClickListener(v -> {
-			@Override
-			public void onClick(View v) {
 			if (listener != null) {
 				listener.onSendClick(ui.editText.getText().toString());
 			}
-			}
 		});
 		ui.emojiDrawer.setEmojiEventListener(this);
 	}
@@ -167,22 +151,13 @@ public class TextInputView extends KeyboardAwareLinearLayout
 		if (isKeyboardOpen()) return;
 
 		if (ui.emojiDrawer.isShowing()) {
-			postOnKeyboardOpen(new Runnable() {
+			postOnKeyboardOpen(this::hideEmojiDrawer);
-				@Override
-				public void run() {
-					hideEmojiDrawer();
 		}
-			});
+		ui.editText.post(() -> {
-		}
-		ui.editText.post(new Runnable() {
-			@Override
-			public void run() {
 			ui.editText.requestFocus();
-				InputMethodManager imm =
+			InputMethodManager imm = (InputMethodManager)
-						(InputMethodManager) getContext()
+					getContext().getSystemService(INPUT_METHOD_SERVICE);
-								.getSystemService(INPUT_METHOD_SERVICE);
 			imm.showSoftInput(ui.editText, SHOW_IMPLICIT);
-			}
 		});
 	}
 
@@ -194,11 +169,7 @@ public class TextInputView extends KeyboardAwareLinearLayout
 
 	public void showEmojiDrawer() {
 		if (isKeyboardOpen()) {
-			postOnKeyboardClose(new Runnable() {
+			postOnKeyboardClose(() -> ui.emojiDrawer.show(getKeyboardHeight()));
-				@Override public void run() {
-					ui.emojiDrawer.show(getKeyboardHeight());
-				}
-			});
 			hideSoftKeyboard();
 		} else {
 			ui.emojiDrawer.show(getKeyboardHeight());

briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java

@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
@@ -62,21 +61,13 @@ public class LinkDialogFragment extends DialogFragment {
 				getString(R.string.link_warning_open_link)) : i;
 
 		Button openButton = (Button) v.findViewById(R.id.openButton);
-		openButton.setOnClickListener(new OnClickListener() {
+		openButton.setOnClickListener(v1 -> {
-			@Override
-			public void onClick(View v) {
 			startActivity(intent);
 			getDialog().dismiss();
-			}
 		});
 
 		Button cancelButton = (Button) v.findViewById(R.id.cancelButton);
-		cancelButton.setOnClickListener(new OnClickListener() {
+		cancelButton.setOnClickListener(v1 -> getDialog().cancel());
-			@Override
-			public void onClick(View v) {
-				getDialog().cancel();
-			}
-		});
 
 		return v;
 	}