Use null safety library.

2026-02-11 18:29:05 +01:00 · 2022-09-29 13:08:02 +01:00
parent 559138c5b6
commit e4e7d84bde
1037 changed files with 1244 additions and 1402 deletions
--- a/briar-api/src/main/java/org/briarproject/briar/api/attachment/Attachment.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/attachment/Attachment.java
@@ -1,6 +1,6 @@
 package org.briarproject.briar.api.attachment;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.io.InputStream;

--- a/briar-api/src/main/java/org/briarproject/briar/api/attachment/AttachmentHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/attachment/AttachmentHeader.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.attachment;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java
@@ -3,8 +3,8 @@ package org.briarproject.briar.api.autodelete;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import static java.util.concurrent.TimeUnit.DAYS;

--- a/briar-api/src/main/java/org/briarproject/briar/api/autodelete/event/AutoDeleteTimerMirroredEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/autodelete/event/AutoDeleteTimerMirroredEvent.java
@@ -2,7 +2,7 @@ package org.briarproject.briar.api.autodelete.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/autodelete/event/ConversationMessagesDeletedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/autodelete/event/ConversationMessagesDeletedEvent.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.autodelete.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;

--- a/briar-api/src/main/java/org/briarproject/briar/api/avatar/AvatarManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/avatar/AvatarManager.java
@@ -3,9 +3,9 @@ package org.briarproject.briar.api.avatar;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.io.IOException;
 import java.io.InputStream;
--- a/briar-api/src/main/java/org/briarproject/briar/api/avatar/event/AvatarUpdatedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/avatar/event/AvatarUpdatedEvent.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.avatar.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/Blog.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/Blog.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.blog;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.briar.api.client.BaseGroup;
 import org.briarproject.briar.api.sharing.Shareable;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogCommentHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogCommentHeader.java
@@ -1,10 +1,10 @@
 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.identity.AuthorInfo;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogFactory.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.blog;

 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface BlogFactory {
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.blog;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.sharing.InvitationRequest;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.blog;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.sharing.InvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public class BlogInvitationResponse extends InvitationResponse {
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogManager.java
@@ -4,10 +4,10 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;
 import java.util.List;
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPost.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPost.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.blog;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.forum.ForumPost;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java
@@ -3,10 +3,10 @@ package org.briarproject.briar.api.blog;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.security.GeneralSecurityException;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostHeader.java
+++ b/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 org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogInvitationRequestReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogInvitationRequestReceivedEvent.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.blog.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.blog.Blog;
 import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogInvitationResponseReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogInvitationResponseReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.blog.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.blog.BlogInvitationResponse;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogPostAddedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogPostAddedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.blog.event;

 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.blog.BlogPostHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/client/BaseGroup.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/BaseGroup.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.client;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/client/MessageTracker.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/MessageTracker.java
@@ -2,11 +2,11 @@ package org.briarproject.briar.api.client;

 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.conversation.ConversationManager;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/client/MessageTree.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/MessageTree.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.client;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;
 import java.util.List;
--- a/briar-api/src/main/java/org/briarproject/briar/api/client/NamedGroup.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/NamedGroup.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.client;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/client/PostHeader.java
+++ b/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.bramble.api.sync.MessageId;
 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.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/client/SessionId.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/SessionId.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.client;

 import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.ThreadSafe;

--- a/briar-api/src/main/java/org/briarproject/briar/api/client/ThreadedMessage.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/ThreadedMessage.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.client;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationManager.java
@@ -4,13 +4,13 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;
 import java.util.Set;
--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationMessageHeader.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.conversation;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationMessageVisitor.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationMessageVisitor.java
@@ -1,6 +1,5 @@
 package org.briarproject.briar.api.conversation;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.blog.BlogInvitationRequest;
 import org.briarproject.briar.api.blog.BlogInvitationResponse;
 import org.briarproject.briar.api.forum.ForumInvitationRequest;
@@ -10,6 +9,7 @@ import org.briarproject.briar.api.introduction.IntroductionResponse;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface ConversationMessageVisitor<T> {
--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationRequest.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationRequest.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.conversation;

 import org.briarproject.bramble.api.Nameable;
-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.SessionId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationResponse.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationResponse.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.conversation;

-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.SessionId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/DeletionResult.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/DeletionResult.java
@@ -1,6 +1,6 @@
 package org.briarproject.briar.api.conversation;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.NotThreadSafe;

--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/event/ConversationMessageReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/event/ConversationMessageReceivedEvent.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.conversation.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/conversation/event/ConversationMessageTrackedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/conversation/event/ConversationMessageTrackedEvent.java
@@ -2,9 +2,7 @@ package org.briarproject.briar.api.conversation.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/feed/Feed.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/feed/Feed.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.feed;

 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.blog.Blog;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/feed/FeedManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/feed/FeedManager.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.feed;

 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.io.IOException;
 import java.util.List;
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/Forum.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/Forum.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.forum;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.briar.api.client.NamedGroup;
 import org.briarproject.briar.api.sharing.Shareable;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumFactory.java
@@ -1,6 +1,6 @@
 package org.briarproject.briar.api.forum;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface ForumFactory {
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.forum;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.sharing.InvitationRequest;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.forum;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.sharing.InvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumManager.java
@@ -4,11 +4,11 @@ import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;
 import java.util.List;
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPost.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPost.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.forum;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.ThreadedMessage;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java
@@ -3,9 +3,9 @@ package org.briarproject.briar.api.forum;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.security.GeneralSecurityException;

--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostHeader.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.forum;

 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.MessageId;
 import org.briarproject.briar.api.client.PostHeader;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationRequestReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationRequestReceivedEvent.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.forum.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.forum.Forum;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationResponseReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationResponseReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.forum.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.forum.ForumInvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumPostReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumPostReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.forum.event;

 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.forum.ForumPostHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.identity;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.NullSafety;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NullSafety;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorManager.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface AuthorManager {
--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionManager.java
@@ -4,10 +4,10 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.briar.api.client.SessionId;
 import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java
@@ -1,13 +1,13 @@
 package org.briarproject.briar.api.introduction;

 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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.conversation.ConversationRequest;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java
@@ -1,13 +1,13 @@
 package org.briarproject.briar.api.introduction;

 import org.briarproject.bramble.api.identity.Author;
-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.conversation.ConversationResponse;
 import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/Role.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/Role.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.introduction;

 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionAbortedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionAbortedEvent.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.introduction.event;

 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionRequestReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionRequestReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.introduction.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.introduction.IntroductionRequest;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionResponseReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/event/IntroductionResponseReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.introduction.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.introduction.IntroductionResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
@@ -3,13 +3,13 @@ package org.briarproject.briar.api.messaging;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.attachment.FileTooBigException;
 import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.io.IOException;
 import java.io.InputStream;
--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.messaging;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.List;

--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.messaging;

 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.List;

--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.messaging;

-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.attachment.AttachmentHeader;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.List;

--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/event/AttachmentReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/event/AttachmentReceivedEvent.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.messaging.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/event/PrivateMessageReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/event/PrivateMessageReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.messaging.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.api.privategroup;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.briar.api.identity.AuthorInfo;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessage.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessage.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.privategroup;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.ThreadedMessage;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java
@@ -2,9 +2,9 @@ package org.briarproject.briar.api.privategroup;

 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageHeader.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.privategroup;

 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 org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/JoinMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/JoinMessageHeader.java
@@ -1,6 +1,6 @@
 package org.briarproject.briar.api.privategroup;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/MessageType.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/MessageType.java
@@ -1,6 +1,6 @@
 package org.briarproject.briar.api.privategroup;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroup.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroup.java
@@ -1,10 +1,10 @@
 package org.briarproject.briar.api.privategroup;

 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.briar.api.client.NamedGroup;
 import org.briarproject.briar.api.sharing.Shareable;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroupFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroupFactory.java
@@ -2,8 +2,8 @@ package org.briarproject.briar.api.privategroup;

 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface PrivateGroupFactory {
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroupManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/PrivateGroupManager.java
@@ -5,11 +5,11 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;
 import java.util.List;
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/Visibility.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/Visibility.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.privategroup;

 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/ContactRelationshipRevealedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/ContactRelationshipRevealedEvent.java
@@ -3,9 +3,9 @@ package org.briarproject.briar.api.privategroup.event;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.privategroup.Visibility;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupDissolvedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupDissolvedEvent.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.privategroup.event;

 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupInvitationRequestReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupInvitationRequestReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.privategroup.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupInvitationResponseReceivedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupInvitationResponseReceivedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.privategroup.event;

 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupMessageAddedEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupMessageAddedEvent.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.privategroup.event;

 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.privategroup.GroupMessageHeader;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java
@@ -5,8 +5,8 @@ import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationItem.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationItem.java
@@ -1,9 +1,9 @@
 package org.briarproject.briar.api.privategroup.invitation;

 import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.sharing.InvitationItem;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationManager.java
@@ -3,13 +3,13 @@ package org.briarproject.briar.api.privategroup.invitation;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.client.ProtocolStateException;
 import org.briarproject.briar.api.client.SessionId;
 import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;

--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java
@@ -1,12 +1,12 @@
 package org.briarproject.briar.api.privategroup.invitation;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.sharing.InvitationRequest;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
--- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java
@@ -1,11 +1,11 @@
 package org.briarproject.briar.api.privategroup.invitation;

-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.SessionId;
 import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
 import org.briarproject.briar.api.sharing.InvitationResponse;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationItem.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationItem.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.sharing;

-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java
@@ -1,8 +1,8 @@
 package org.briarproject.briar.api.sharing;

 import org.briarproject.bramble.api.Nameable;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface Shareable extends Nameable {
--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingInvitationItem.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingInvitationItem.java
@@ -1,7 +1,7 @@
 package org.briarproject.briar.api.sharing;

 import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;

--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingManager.java
@@ -4,10 +4,10 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.client.SessionId;
 import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
+import org.briarproject.nullsafety.NotNullByDefault;

 import java.util.Collection;

--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/event/ContactLeftShareableEvent.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/event/ContactLeftShareableEvent.java
@@ -3,8 +3,8 @@ package org.briarproject.briar.api.sharing.event;

 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.nullsafety.NotNullByDefault;

 import javax.annotation.concurrent.Immutable;

--- a/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.api.test;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;

@NotNullByDefault
 public interface TestDataCreator {