Rewrap some lines.

bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java

@@ -21,8 +21,9 @@ public interface CleanupHook {
 	 * <p>
 	 * The callee is not required to delete the messages, but the hook won't be
 	 * called again for these messages unless another cleanup timer is set (see
-	 * {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)}
-	 * and {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)}).
+	 * {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId,
+	 * long)} and {@link DatabaseComponent#startCleanupTimer(Transaction,
+	 * MessageId)}).
 	 */
 	void deleteMessages(Transaction txn, GroupId g,
 			Collection<MessageId> messageIds) throws DbException;

bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java

@@ -18,8 +18,8 @@ import org.briarproject.bramble.api.sync.MessageId;
  * {@link CleanupTimerStartedEvent CleanupTimerStartedEvents} broadcast by the
  * {@link DatabaseComponent}.
  * <p>
- * See {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)},
- * {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)},
+ * See {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId,
+ * long)}, {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)},
  * {@link DatabaseComponent#stopCleanupTimer(Transaction, MessageId)}.
  */
 @NotNullByDefault

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

@@ -35,8 +35,8 @@ public interface TaskScheduler {
 
 		/**
 		 * Cancels the task if it has not already started running. If the task
-		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long, TimeUnit) periodic},
-		 * all future executions of the task are cancelled.
+		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long,
+		 * TimeUnit) periodic}, all future executions of the task are cancelled.
 		 */
 		void cancel();
 	}

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

@@ -845,8 +845,8 @@ interface Database<T> {
 	 * of the given message with respect to the given contact, using the latency
 	 * of the transport over which it was sent.
 	 */
-	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m, long maxLatency)
-			throws DbException;
+	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m,
+			long maxLatency) throws DbException;
 
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.

bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java

@@ -22,7 +22,8 @@ class SocksSocketFactory extends SocketFactory {
 
 	@Override
 	public Socket createSocket() {
-		return new SocksSocket(proxy, connectToProxyTimeout, extraSocketTimeout);
+		return new SocksSocket(proxy, connectToProxyTimeout,
+				extraSocketTimeout);
 	}
 
 	@Override

bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java

@@ -91,13 +91,15 @@ class CountryCodes {
 			new Country("GP", "Guadeloupe", "590", "00", ""),
 			new Country("GQ", "Equatorial Guinea", "240", "00", ""),
 			new Country("GR", "Greece", "30", "00", ""),
-		new Country("GS", "South Georgia and the South Sandwich Islands", "995", "8**10", "8"),
+			new Country("GS", "South Georgia and the South Sandwich Islands",
+					"995", "8**10", "8"),
 			new Country("GT", "Guatemala", "502", "00", ""),
 			new Country("GU", "Guam", "1", "011", "1"),
 			new Country("GW", "Guinea-Bissau", "245", "00", ""),
 			new Country("GY", "Guyana", "592", "001", "0"),
 			new Country("HK", "Hong Kong", "852", "001", ""),
-		new Country("HM", "Heard Island and McDonald Islands", "692", "00", "0"),
+			new Country("HM", "Heard Island and McDonald Islands",
+					"692", "00", "0"),
 			new Country("HN", "Honduras", "504", "00", "0"),
 			new Country("HR", "Croatia", "385", "00", "0"),
 			new Country("HT", "Haiti", "509", "00", "0"),
@@ -106,7 +108,8 @@ class CountryCodes {
 			new Country("IE", "Ireland", "353", "00", "0"),
 			new Country("IL", "Israel", "972", "00", "0"),
 			new Country("IN", "India", "91", "00", "0"),
-		new Country("IO", "British Indian Ocean Territory", "246", "00", ""),
+			new Country("IO", "British Indian Ocean Territory", "246", "00",
+					""),
 			new Country("IQ", "Iraq", "964", "00", "0"),
 		new Country("IR", "Iran", "98", "00", "0"),
 		new Country("IS", "Iceland", "354", "00", "0"),

bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java

@@ -28,7 +28,8 @@ class SerialPortImpl implements SerialPort {
 	@Override
 	public void closePort() throws IOException {
 		try {
-			if (!port.closePort()) throw new IOException("Failed to close port");
+			if (!port.closePort())
+				throw new IOException("Failed to close port");
 		} catch (SerialPortException e) {
 			throw new IOException(e);
 		}

briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostHeader.java

@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.blog;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.briar.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.PostHeader;
+import org.briarproject.briar.api.identity.AuthorInfo;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -21,7 +21,8 @@ public class BlogPostHeader extends PostHeader {
 
 	public BlogPostHeader(MessageType type, GroupId groupId, MessageId id,
 			@Nullable MessageId parentId, long timestamp, long timeReceived,
-			Author author, AuthorInfo authorInfo, boolean rssFeed, boolean read) {
+			Author author, AuthorInfo authorInfo, boolean rssFeed,
+			boolean read) {
 		super(id, parentId, timestamp, author, authorInfo, read);
 		this.type = type;
 		this.groupId = groupId;

briar-api/src/main/java/org/briarproject/briar/api/client/PostHeader.java

@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.client;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.briar.api.identity.AuthorInfo;
-import org.briarproject.briar.api.identity.AuthorInfo.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorInfo.Status;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -22,7 +22,8 @@ public abstract class PostHeader {
 	private final boolean read;
 
 	public PostHeader(MessageId id, @Nullable MessageId parentId,
-			long timestamp, Author author, AuthorInfo authorInfo, boolean read) {
+			long timestamp, Author author, AuthorInfo authorInfo,
+			boolean read) {
 		this.id = id;
 		this.parentId = parentId;
 		this.timestamp = timestamp;

briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationRequestReceivedEvent.java

@@ -13,8 +13,8 @@ import javax.annotation.concurrent.Immutable;
 public class ForumInvitationRequestReceivedEvent extends
 		ConversationMessageReceivedEvent<ConversationRequest<Forum>> {
 
-	public ForumInvitationRequestReceivedEvent(ConversationRequest<Forum> request,
-			ContactId contactId) {
+	public ForumInvitationRequestReceivedEvent(
+			ConversationRequest<Forum> request, ContactId contactId) {
 		super(request, contactId);
 	}
 

briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java

@@ -51,8 +51,8 @@ public class PrivateMessage {
 
 	/**
 	 * Constructor for private messages in the
-	 * {@link PrivateMessageFormat#TEXT_IMAGES_AUTO_DELETE TEXT_IMAGES_AUTO_DELETE}
-	 * format.
+	 * {@link PrivateMessageFormat#TEXT_IMAGES_AUTO_DELETE
+	 * TEXT_IMAGES_AUTO_DELETE} format.
 	 */
 	public PrivateMessage(Message message, boolean hasText,
 			List<AttachmentHeader> headers, long autoDeleteTimer) {

briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java

@@ -30,9 +30,9 @@ public interface PrivateMessageFactory {
 
 	/**
 	 * Creates a private message in the
-	 * {@link PrivateMessageFormat#TEXT_IMAGES_AUTO_DELETE TEXT_IMAGES_AUTO_DELETE}
-	 * format. This format requires the contact to support client version 0.3
-	 * or higher.
+	 * {@link PrivateMessageFormat#TEXT_IMAGES_AUTO_DELETE
+	 * TEXT_IMAGES_AUTO_DELETE} format. This format requires the contact to
+	 * support client version 0.3 or higher.
 	 */
 	PrivateMessage createPrivateMessage(GroupId groupId, long timestamp,
 			@Nullable String text, List<AttachmentHeader> headers,

briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java

@@ -653,8 +653,8 @@ class IntroducerProtocolEngine
 
 	/**
 	 * Returns a timestamp for an invisible outgoing message. The timestamp is
-	 * later than the {@link #getSessionTimestamp(IntroducerSession, PeerSession)
-	 * session timestamp}.
+	 * later than the {@link #getSessionTimestamp(IntroducerSession,
+	 * PeerSession) session timestamp}.
 	 */
 	private long getTimestampForInvisibleMessage(IntroducerSession s,
 			PeerSession p) {