From e4e7d84bde9e1d89b39431988a35086017416d44 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 29 Sep 2022 13:08:02 +0100 Subject: [PATCH] Use null safety library. --- .../bramble/api/system/AlarmListener.java | 2 +- .../bramble/api/system/AndroidWakeLock.java | 2 +- .../api/system/AndroidWakeLockManager.java | 2 +- .../network/AndroidNetworkManager.java | 6 +-- .../AndroidBluetoothConnectionFactory.java | 2 +- .../bluetooth/AndroidBluetoothPlugin.java | 4 +- .../AndroidBluetoothPluginFactory.java | 2 +- .../AndroidBluetoothTransportConnection.java | 2 +- .../file/AndroidRemovableDrivePlugin.java | 2 +- .../AndroidRemovableDrivePluginFactory.java | 2 +- .../plugin/tcp/AndroidLanTcpPlugin.java | 4 +- .../tcp/AndroidLanTcpPluginFactory.java | 2 +- .../bramble/plugin/tor/AndroidTorPlugin.java | 4 +- .../plugin/tor/AndroidTorPluginFactory.java | 2 +- .../bramble/system/AlarmConstants.java | 2 +- .../bramble/system/AndroidLocationUtils.java | 2 +- .../system/AndroidResourceProvider.java | 2 +- .../system/AndroidSecureRandomProvider.java | 2 +- .../bramble/system/AndroidTaskScheduler.java | 2 +- .../bramble/system/AndroidWakeLockImpl.java | 2 +- .../system/AndroidWakeLockManagerImpl.java | 4 +- .../bramble/system/RenewableWakeLock.java | 4 +- .../bramble/system/SharedWakeLock.java | 2 +- .../bramble/util/AndroidUtils.java | 4 +- bramble-api/build.gradle | 2 + .../org/briarproject/bramble/api/Bytes.java | 2 +- .../briarproject/bramble/api/Consumer.java | 2 +- .../briarproject/bramble/api/Multiset.java | 2 +- .../briarproject/bramble/api/Nameable.java | 2 +- .../org/briarproject/bramble/api/Pair.java | 2 +- .../briarproject/bramble/api/Predicate.java | 2 +- .../briarproject/bramble/api/UniqueId.java | 2 +- .../bramble/api/WeakSingletonProvider.java | 2 +- .../bramble/api/account/AccountManager.java | 2 +- .../bramble/api/cleanup/CleanupHook.java | 2 +- .../bramble/api/cleanup/CleanupManager.java | 2 +- .../event/CleanupTimerStartedEvent.java | 2 +- .../api/client/BdfIncomingMessageHook.java | 2 +- .../bramble/api/client/BdfMessageContext.java | 2 +- .../api/client/BdfMessageValidator.java | 2 +- .../bramble/api/client/ClientHelper.java | 2 +- .../api/client/ContactGroupFactory.java | 2 +- .../api/connection/ConnectionManager.java | 2 +- .../api/connection/ConnectionRegistry.java | 2 +- .../connection/InterruptibleConnection.java | 2 +- .../bramble/api/contact/Contact.java | 2 +- .../api/contact/ContactExchangeManager.java | 2 +- .../bramble/api/contact/ContactId.java | 2 +- .../bramble/api/contact/ContactManager.java | 2 +- .../bramble/api/contact/HandshakeManager.java | 2 +- .../bramble/api/contact/PendingContact.java | 2 +- .../bramble/api/contact/PendingContactId.java | 2 +- .../api/contact/event/ContactAddedEvent.java | 2 +- .../event/ContactAliasChangedEvent.java | 2 +- .../contact/event/ContactRemovedEvent.java | 2 +- .../contact/event/ContactVerifiedEvent.java | 2 +- .../event/PendingContactAddedEvent.java | 2 +- .../event/PendingContactRemovedEvent.java | 2 +- .../PendingContactStateChangedEvent.java | 2 +- .../api/crypto/AgreementPrivateKey.java | 2 +- .../api/crypto/AgreementPublicKey.java | 2 +- .../bramble/api/crypto/CryptoComponent.java | 2 +- .../api/crypto/DecryptionException.java | 2 +- .../bramble/api/crypto/KeyPair.java | 2 +- .../bramble/api/crypto/KeyParser.java | 2 +- .../bramble/api/crypto/KeyStrengthener.java | 2 +- .../api/crypto/PasswordStrengthEstimator.java | 2 +- .../bramble/api/crypto/PrivateKey.java | 2 +- .../bramble/api/crypto/PublicKey.java | 2 +- .../api/crypto/SignaturePrivateKey.java | 2 +- .../api/crypto/SignaturePublicKey.java | 2 +- .../bramble/api/crypto/StreamDecrypter.java | 2 +- .../api/crypto/StreamDecrypterFactory.java | 2 +- .../bramble/api/crypto/StreamEncrypter.java | 2 +- .../api/crypto/StreamEncrypterFactory.java | 2 +- .../bramble/api/data/BdfEntry.java | 2 +- .../bramble/api/data/BdfReader.java | 2 +- .../bramble/api/data/BdfReaderFactory.java | 2 +- .../bramble/api/data/BdfStringUtils.java | 2 +- .../bramble/api/data/BdfWriterFactory.java | 2 +- .../bramble/api/data/MetadataEncoder.java | 2 +- .../bramble/api/data/MetadataParser.java | 2 +- .../bramble/api/db/DatabaseComponent.java | 2 +- .../bramble/api/db/DatabaseConfig.java | 2 +- .../bramble/api/db/DbCallable.java | 2 +- .../bramble/api/db/DbRunnable.java | 2 +- .../bramble/api/db/NullableDbCallable.java | 2 +- .../bramble/api/db/TransactionManager.java | 2 +- .../bramble/api/event/EventBus.java | 2 +- .../bramble/api/event/EventListener.java | 2 +- .../bramble/api/identity/Author.java | 2 +- .../bramble/api/identity/AuthorFactory.java | 2 +- .../bramble/api/identity/AuthorId.java | 2 +- .../bramble/api/identity/Identity.java | 2 +- .../bramble/api/identity/IdentityManager.java | 2 +- .../bramble/api/identity/LocalAuthor.java | 2 +- .../identity/event/IdentityAddedEvent.java | 2 +- .../identity/event/IdentityRemovedEvent.java | 2 +- .../keyagreement/KeyAgreementConnection.java | 2 +- .../api/keyagreement/KeyAgreementTask.java | 2 +- .../bramble/api/keyagreement/Payload.java | 2 +- .../api/keyagreement/PayloadEncoder.java | 2 +- .../api/keyagreement/PayloadParser.java | 2 +- .../api/keyagreement/TransportDescriptor.java | 2 +- .../event/KeyAgreementAbortedEvent.java | 2 +- .../event/KeyAgreementFinishedEvent.java | 2 +- .../event/KeyAgreementListeningEvent.java | 2 +- .../api/lifecycle/LifecycleManager.java | 2 +- .../api/lifecycle/ShutdownManager.java | 2 +- .../mailbox/InvalidMailboxIdException.java | 2 +- .../bramble/api/mailbox/MailboxAuthToken.java | 2 +- .../bramble/api/mailbox/MailboxFileId.java | 2 +- .../bramble/api/mailbox/MailboxFolderId.java | 2 +- .../bramble/api/mailbox/MailboxHelper.java | 2 +- .../bramble/api/mailbox/MailboxId.java | 2 +- .../api/mailbox/MailboxPairingTask.java | 2 +- .../api/mailbox/MailboxProperties.java | 4 +- .../api/mailbox/MailboxSettingsManager.java | 2 +- .../bramble/api/mailbox/MailboxStatus.java | 2 +- .../bramble/api/mailbox/MailboxUpdate.java | 2 +- .../api/mailbox/MailboxUpdateManager.java | 2 +- .../api/mailbox/MailboxUpdateWithMailbox.java | 2 +- .../bramble/api/mailbox/MailboxVersion.java | 2 +- .../api/mailbox/event/MailboxPairedEvent.java | 2 +- .../mailbox/event/MailboxProblemEvent.java | 2 +- .../mailbox/event/MailboxUnpairedEvent.java | 2 +- .../MailboxUpdateSentToNewContactEvent.java | 2 +- .../OwnMailboxConnectionStatusEvent.java | 2 +- .../event/RemoteMailboxUpdateEvent.java | 2 +- .../bramble/api/network/NetworkManager.java | 2 +- .../bramble/api/network/NetworkStatus.java | 2 +- .../api/network/event/NetworkStatusEvent.java | 2 +- .../nullsafety/FieldsNotNullByDefault.java | 26 ------------ .../nullsafety/MethodsNotNullByDefault.java | 28 ------------- .../api/nullsafety/NotNullByDefault.java | 32 --------------- .../bramble/api/nullsafety/NullSafety.java | 40 ------------------- .../ParametersNotNullByDefault.java | 28 ------------- .../bramble/api/plugin/ConnectionHandler.java | 2 +- .../bramble/api/plugin/Plugin.java | 2 +- .../bramble/api/plugin/PluginCallback.java | 2 +- .../bramble/api/plugin/PluginConfig.java | 2 +- .../bramble/api/plugin/PluginFactory.java | 2 +- .../bramble/api/plugin/PluginManager.java | 2 +- .../api/plugin/TransportConnectionReader.java | 2 +- .../api/plugin/TransportConnectionWriter.java | 2 +- .../AbstractDuplexTransportConnection.java | 2 +- .../api/plugin/duplex/DuplexPlugin.java | 2 +- .../plugin/duplex/DuplexPluginFactory.java | 2 +- .../duplex/DuplexTransportConnection.java | 2 +- .../plugin/event/ConnectionClosedEvent.java | 2 +- .../plugin/event/ConnectionOpenedEvent.java | 2 +- .../plugin/event/ContactConnectedEvent.java | 2 +- .../event/ContactDisconnectedEvent.java | 2 +- .../plugin/event/TransportActiveEvent.java | 2 +- .../plugin/event/TransportInactiveEvent.java | 2 +- .../api/plugin/event/TransportStateEvent.java | 2 +- .../plugin/file/RemovableDriveManager.java | 2 +- .../api/plugin/file/RemovableDriveTask.java | 2 +- .../api/plugin/simplex/SimplexPlugin.java | 2 +- .../plugin/simplex/SimplexPluginFactory.java | 2 +- .../properties/TransportPropertyManager.java | 2 +- ...RemoteTransportPropertiesUpdatedEvent.java | 2 +- .../bramble/api/record/Record.java | 2 +- .../bramble/api/record/RecordReader.java | 2 +- .../bramble/api/record/RecordWriter.java | 2 +- .../bramble/api/reliability/ReadHandler.java | 2 +- .../api/reliability/ReliabilityLayer.java | 2 +- .../reliability/ReliabilityLayerFactory.java | 2 +- .../bramble/api/reliability/WriteHandler.java | 2 +- .../api/rendezvous/KeyMaterialSource.java | 2 +- .../RendezvousConnectionClosedEvent.java | 2 +- .../RendezvousConnectionOpenedEvent.java | 2 +- .../rendezvous/event/RendezvousPollEvent.java | 2 +- .../bramble/api/reporting/DevConfig.java | 2 +- .../bramble/api/reporting/DevReporter.java | 2 +- .../bramble/api/settings/SettingsManager.java | 2 +- .../settings/event/SettingsUpdatedEvent.java | 2 +- .../briarproject/bramble/api/sync/Ack.java | 2 +- .../bramble/api/sync/ClientId.java | 2 +- .../bramble/api/sync/GroupFactory.java | 2 +- .../bramble/api/sync/GroupId.java | 2 +- .../bramble/api/sync/Message.java | 2 +- .../bramble/api/sync/MessageContext.java | 2 +- .../bramble/api/sync/MessageFactory.java | 2 +- .../bramble/api/sync/MessageId.java | 2 +- .../briarproject/bramble/api/sync/Offer.java | 2 +- .../api/sync/OutgoingSessionRecord.java | 2 +- .../bramble/api/sync/Priority.java | 2 +- .../bramble/api/sync/PriorityHandler.java | 2 +- .../bramble/api/sync/Request.java | 2 +- .../bramble/api/sync/SyncRecordReader.java | 2 +- .../api/sync/SyncRecordReaderFactory.java | 2 +- .../bramble/api/sync/SyncRecordWriter.java | 2 +- .../api/sync/SyncRecordWriterFactory.java | 2 +- .../bramble/api/sync/SyncSessionFactory.java | 2 +- .../bramble/api/sync/Versions.java | 2 +- .../sync/event/CloseSyncConnectionsEvent.java | 2 +- .../api/sync/event/GroupAddedEvent.java | 2 +- .../api/sync/event/GroupRemovedEvent.java | 2 +- .../event/GroupVisibilityUpdatedEvent.java | 2 +- .../api/sync/event/MessageAddedEvent.java | 2 +- .../api/sync/event/MessageRequestedEvent.java | 2 +- .../api/sync/event/MessageSharedEvent.java | 2 +- .../sync/event/MessageStateChangedEvent.java | 2 +- .../api/sync/event/MessageToAckEvent.java | 2 +- .../api/sync/event/MessageToRequestEvent.java | 2 +- .../api/sync/event/MessagesAckedEvent.java | 2 +- .../api/sync/event/MessagesSentEvent.java | 2 +- .../sync/event/SyncVersionsUpdatedEvent.java | 2 +- .../sync/validation/ValidationManager.java | 2 +- .../bramble/api/system/LocationUtils.java | 2 +- .../bramble/api/system/ResourceProvider.java | 2 +- .../api/system/SecureRandomProvider.java | 2 +- .../bramble/api/system/TaskScheduler.java | 2 +- .../bramble/api/transport/IncomingKeys.java | 2 +- .../bramble/api/transport/KeySetId.java | 2 +- .../bramble/api/transport/OutgoingKeys.java | 2 +- .../bramble/api/transport/StreamContext.java | 4 +- .../api/transport/StreamReaderFactory.java | 2 +- .../api/transport/StreamWriterFactory.java | 2 +- .../api/transport/TransportKeySet.java | 4 +- .../bramble/api/transport/TransportKeys.java | 2 +- .../TransportKeyAgreementManager.java | 2 +- .../api/versioning/ClientMajorVersion.java | 2 +- .../bramble/api/versioning/ClientVersion.java | 2 +- .../versioning/ClientVersioningManager.java | 2 +- .../event/ClientVersionUpdatedEvent.java | 2 +- .../briarproject/bramble/util/IoUtils.java | 2 +- .../bramble/util/NetworkUtils.java | 2 +- .../briarproject/bramble/util/OsUtils.java | 2 +- .../bramble/util/PrivacyUtils.java | 2 +- .../bramble/util/StringUtils.java | 2 +- .../bramble/util/ValidationUtils.java | 2 +- .../briarproject/bramble/PoliteExecutor.java | 2 +- .../bramble/TimeLoggingExecutor.java | 2 +- .../bramble/account/AccountManagerImpl.java | 4 +- .../bramble/cleanup/CleanupManagerImpl.java | 2 +- .../bramble/client/ClientHelperImpl.java | 2 +- .../client/ContactGroupFactoryImpl.java | 2 +- .../bramble/connection/Connection.java | 2 +- .../connection/ConnectionManagerImpl.java | 2 +- .../connection/ConnectionRegistryImpl.java | 2 +- .../connection/DuplexSyncConnection.java | 4 +- .../connection/HandshakeConnection.java | 2 +- .../IncomingDuplexSyncConnection.java | 2 +- .../IncomingHandshakeConnection.java | 2 +- .../IncomingSimplexSyncConnection.java | 2 +- .../OutgoingDuplexSyncConnection.java | 2 +- .../OutgoingHandshakeConnection.java | 2 +- .../OutgoingSimplexSyncConnection.java | 4 +- .../bramble/connection/SyncConnection.java | 4 +- .../contact/ContactExchangeCrypto.java | 2 +- .../contact/ContactExchangeCryptoImpl.java | 2 +- .../contact/ContactExchangeManagerImpl.java | 2 +- .../bramble/contact/ContactManagerImpl.java | 2 +- .../bramble/contact/HandshakeCrypto.java | 2 +- .../bramble/contact/HandshakeCryptoImpl.java | 2 +- .../bramble/contact/HandshakeManagerImpl.java | 2 +- .../bramble/crypto/AgreementKeyParser.java | 2 +- .../bramble/crypto/AsciiArmour.java | 2 +- .../bramble/crypto/AuthenticatedCipher.java | 2 +- .../bramble/crypto/CryptoComponentImpl.java | 2 +- .../bramble/crypto/EdSignature.java | 2 +- .../bramble/crypto/FrameEncoder.java | 2 +- .../bramble/crypto/MessageEncrypter.java | 2 +- .../crypto/PasswordStrengthEstimatorImpl.java | 2 +- .../bramble/crypto/Sec1KeyParser.java | 2 +- .../bramble/crypto/Sec1PrivateKey.java | 2 +- .../bramble/crypto/Sec1PublicKey.java | 2 +- .../bramble/crypto/Sec1Utils.java | 2 +- .../bramble/crypto/Signature.java | 2 +- .../bramble/crypto/SignatureKeyParser.java | 2 +- .../crypto/StreamDecrypterFactoryImpl.java | 2 +- .../bramble/crypto/StreamDecrypterImpl.java | 2 +- .../crypto/StreamEncrypterFactoryImpl.java | 2 +- .../bramble/crypto/StreamEncrypterImpl.java | 2 +- .../XSalsa20Poly1305AuthenticatedCipher.java | 2 +- .../bramble/data/BdfReaderFactoryImpl.java | 2 +- .../bramble/data/BdfReaderImpl.java | 2 +- .../bramble/data/BdfWriterFactoryImpl.java | 2 +- .../bramble/data/BdfWriterImpl.java | 2 +- .../bramble/data/MetadataEncoderImpl.java | 2 +- .../bramble/data/MetadataParserImpl.java | 2 +- .../org/briarproject/bramble/db/Database.java | 2 +- .../bramble/db/DatabaseComponentImpl.java | 2 +- .../briarproject/bramble/db/H2Database.java | 2 +- .../bramble/db/HyperSqlDatabase.java | 2 +- .../briarproject/bramble/db/JdbcDatabase.java | 2 +- .../briarproject/bramble/db/JdbcUtils.java | 2 +- .../bramble/event/EventBusImpl.java | 2 +- .../bramble/identity/AuthorFactoryImpl.java | 2 +- .../bramble/identity/IdentityManagerImpl.java | 4 +- .../org/briarproject/bramble/io/NoDns.java | 2 +- .../bramble/io/TimeoutInputStream.java | 2 +- .../keyagreement/ConnectionChooserImpl.java | 2 +- .../keyagreement/KeyAgreementConnector.java | 2 +- .../keyagreement/KeyAgreementProtocol.java | 2 +- .../keyagreement/KeyAgreementTaskImpl.java | 4 +- .../keyagreement/KeyAgreementTransport.java | 2 +- .../keyagreement/PayloadEncoderImpl.java | 2 +- .../keyagreement/PayloadParserImpl.java | 2 +- .../lifecycle/LifecycleManagerImpl.java | 2 +- .../lifecycle/ShutdownManagerImpl.java | 2 +- .../bramble/mailbox/ConnectivityChecker.java | 2 +- .../mailbox/ConnectivityCheckerImpl.java | 2 +- .../bramble/mailbox/ContactMailboxClient.java | 2 +- .../ContactMailboxConnectivityChecker.java | 2 +- .../mailbox/ContactMailboxDownloadWorker.java | 4 +- .../bramble/mailbox/MailboxApi.java | 2 +- .../bramble/mailbox/MailboxApiCaller.java | 2 +- .../bramble/mailbox/MailboxApiCallerImpl.java | 2 +- .../bramble/mailbox/MailboxApiImpl.java | 2 +- .../bramble/mailbox/MailboxClient.java | 2 +- .../bramble/mailbox/MailboxClientFactory.java | 2 +- .../mailbox/MailboxClientFactoryImpl.java | 2 +- .../bramble/mailbox/MailboxClientManager.java | 4 +- .../mailbox/MailboxDownloadWorker.java | 2 +- .../bramble/mailbox/MailboxFileManager.java | 2 +- .../mailbox/MailboxFileManagerImpl.java | 4 +- .../bramble/mailbox/MailboxManagerImpl.java | 2 +- .../mailbox/MailboxPairingTaskFactory.java | 2 +- .../MailboxPairingTaskFactoryImpl.java | 2 +- .../mailbox/MailboxPairingTaskImpl.java | 2 +- .../mailbox/MailboxSettingsManagerImpl.java | 2 +- .../mailbox/MailboxUpdateManagerImpl.java | 4 +- .../mailbox/MailboxUpdateValidator.java | 2 +- .../bramble/mailbox/MailboxUploadWorker.java | 2 +- .../bramble/mailbox/MailboxWorker.java | 2 +- .../bramble/mailbox/MailboxWorkerFactory.java | 2 +- .../mailbox/MailboxWorkerFactoryImpl.java | 2 +- .../bramble/mailbox/OwnMailboxClient.java | 2 +- .../OwnMailboxConnectivityChecker.java | 2 +- .../mailbox/OwnMailboxContactListWorker.java | 4 +- .../mailbox/OwnMailboxDownloadWorker.java | 2 +- .../bramble/mailbox/SimpleApiCall.java | 2 +- .../mailbox/TorReachabilityMonitor.java | 2 +- .../mailbox/TorReachabilityMonitorImpl.java | 2 +- .../bramble/mailbox/UrlConverter.java | 2 +- .../bramble/mailbox/UrlConverterImpl.java | 2 +- .../bramble/plugin/BackoffFactoryImpl.java | 2 +- .../bramble/plugin/BackoffImpl.java | 2 +- .../bramble/plugin/PluginManagerImpl.java | 2 +- .../bramble/plugin/PollerImpl.java | 2 +- .../bluetooth/AbstractBluetoothPlugin.java | 6 +-- .../bluetooth/BluetoothConnectionFactory.java | 2 +- .../bluetooth/BluetoothConnectionLimiter.java | 2 +- .../BluetoothConnectionLimiterImpl.java | 2 +- .../plugin/bluetooth/BluetoothPlugin.java | 2 +- .../file/AbstractRemovableDrivePlugin.java | 2 +- .../bramble/plugin/file/FilePlugin.java | 2 +- .../bramble/plugin/file/MailboxPlugin.java | 2 +- .../plugin/file/MailboxPluginFactory.java | 2 +- .../file/RemovableDriveManagerImpl.java | 2 +- .../plugin/file/RemovableDrivePlugin.java | 2 +- .../file/RemovableDrivePluginFactory.java | 2 +- .../plugin/file/RemovableDriveReaderTask.java | 2 +- .../file/RemovableDriveTaskFactory.java | 2 +- .../file/RemovableDriveTaskFactoryImpl.java | 2 +- .../plugin/file/RemovableDriveTaskImpl.java | 4 +- .../file/RemovableDriveTaskRegistry.java | 2 +- .../plugin/file/RemovableDriveWriterTask.java | 2 +- .../file/TransportInputStreamReader.java | 2 +- .../file/TransportOutputStreamWriter.java | 2 +- .../bramble/plugin/tcp/LanTcpPlugin.java | 2 +- .../plugin/tcp/LanTcpPluginFactory.java | 2 +- .../bramble/plugin/tcp/MappingResult.java | 2 +- .../bramble/plugin/tcp/PortMapperImpl.java | 4 +- .../bramble/plugin/tcp/TcpPlugin.java | 6 +-- .../plugin/tcp/TcpTransportConnection.java | 2 +- .../bramble/plugin/tcp/WanTcpPlugin.java | 4 +- .../plugin/tcp/WanTcpPluginFactory.java | 2 +- .../plugin/tor/CircumventionProvider.java | 2 +- .../plugin/tor/CircumventionProviderImpl.java | 4 +- .../bramble/plugin/tor/TorPlugin.java | 6 +-- .../bramble/plugin/tor/TorPluginFactory.java | 2 +- .../plugin/tor/TorTransportConnection.java | 2 +- .../TransportPropertyManagerImpl.java | 2 +- .../TransportPropertyValidator.java | 2 +- .../bramble/record/RecordReaderImpl.java | 2 +- .../bramble/record/RecordWriterImpl.java | 2 +- .../briarproject/bramble/reliability/Ack.java | 2 +- .../bramble/reliability/Crc32.java | 2 +- .../bramble/reliability/Data.java | 2 +- .../bramble/reliability/Frame.java | 2 +- .../bramble/reliability/Receiver.java | 2 +- .../reliability/ReceiverInputStream.java | 2 +- .../ReliabilityLayerFactoryImpl.java | 2 +- .../reliability/ReliabilityLayerImpl.java | 4 +- .../bramble/reliability/Sender.java | 2 +- .../reliability/SenderOutputStream.java | 2 +- .../bramble/reliability/SlipDecoder.java | 2 +- .../bramble/reliability/SlipEncoder.java | 2 +- .../rendezvous/KeyMaterialSourceImpl.java | 2 +- .../bramble/rendezvous/RendezvousCrypto.java | 2 +- .../rendezvous/RendezvousCryptoImpl.java | 2 +- .../rendezvous/RendezvousPollerImpl.java | 6 +-- .../bramble/reporting/DevReportServer.java | 2 +- .../bramble/reporting/DevReporterImpl.java | 2 +- .../bramble/settings/SettingsManagerImpl.java | 2 +- .../bramble/sync/DuplexOutgoingSession.java | 2 +- .../sync/EagerSimplexOutgoingSession.java | 2 +- .../bramble/sync/GroupFactoryImpl.java | 2 +- .../bramble/sync/IncomingSession.java | 2 +- .../bramble/sync/MailboxOutgoingSession.java | 2 +- .../bramble/sync/MessageFactoryImpl.java | 2 +- .../bramble/sync/SimplexOutgoingSession.java | 2 +- .../sync/SyncRecordReaderFactoryImpl.java | 2 +- .../bramble/sync/SyncRecordReaderImpl.java | 2 +- .../sync/SyncRecordWriterFactoryImpl.java | 2 +- .../bramble/sync/SyncRecordWriterImpl.java | 2 +- .../bramble/sync/SyncSessionFactoryImpl.java | 2 +- .../validation/ValidationManagerImpl.java | 2 +- .../system/AbstractSecureRandomProvider.java | 2 +- .../bramble/system/TaskSchedulerImpl.java | 2 +- .../system/UnixSecureRandomProvider.java | 2 +- .../bramble/transport/KeyManagerImpl.java | 2 +- .../transport/MutableIncomingKeys.java | 2 +- .../transport/MutableOutgoingKeys.java | 2 +- .../transport/MutableTransportKeySet.java | 4 +- .../transport/MutableTransportKeys.java | 2 +- .../bramble/transport/ReorderingWindow.java | 2 +- .../transport/StreamReaderFactoryImpl.java | 2 +- .../bramble/transport/StreamReaderImpl.java | 2 +- .../transport/StreamWriterFactoryImpl.java | 2 +- .../bramble/transport/StreamWriterImpl.java | 2 +- .../transport/TransportKeyManager.java | 2 +- .../transport/TransportKeyManagerFactory.java | 2 +- .../TransportKeyManagerFactoryImpl.java | 2 +- .../transport/TransportKeyManagerImpl.java | 4 +- .../transport/agreement/MessageEncoder.java | 2 +- .../agreement/MessageEncoderImpl.java | 2 +- .../transport/agreement/MessageType.java | 2 +- .../bramble/transport/agreement/Session.java | 2 +- .../transport/agreement/SessionEncoder.java | 2 +- .../agreement/SessionEncoderImpl.java | 2 +- .../transport/agreement/SessionParser.java | 2 +- .../agreement/SessionParserImpl.java | 2 +- .../bramble/transport/agreement/State.java | 2 +- .../TransportKeyAgreementConstants.java | 2 +- .../TransportKeyAgreementCrypto.java | 2 +- .../TransportKeyAgreementCryptoImpl.java | 2 +- .../TransportKeyAgreementManagerImpl.java | 4 +- .../TransportKeyAgreementValidator.java | 2 +- .../ClientVersioningManagerImpl.java | 2 +- .../versioning/ClientVersioningValidator.java | 2 +- .../client/BdfMessageValidatorTest.java | 2 +- .../ContactExchangeIntegrationTest.java | 2 +- .../bramble/crypto/PseudoRandom.java | 2 +- .../crypto/TestAuthenticatedCipher.java | 2 +- .../bramble/db/DatabaseMigrationTest.java | 2 +- .../bramble/db/H2MigrationTest.java | 2 +- ...leepDatabasePerformanceComparisonTest.java | 2 +- .../bramble/db/HyperSqlMigrationTest.java | 2 +- .../mailbox/ContactMailboxClientTest.java | 2 +- .../mailbox/MailboxClientManagerTest.java | 2 +- .../OwnMailboxContactListWorkerTest.java | 2 +- .../file/RemovableDriveIntegrationTest.java | 2 +- .../RemovableDriveIntegrationTestModule.java | 2 +- .../bramble/plugin/tcp/LanTcpPluginTest.java | 2 +- .../bramble/system/TestTaskScheduler.java | 2 +- .../bramble/test/BrambleIntegrationTest.java | 4 +- .../bramble/test/CollectionMatcher.java | 2 +- .../bramble/test/ImmediateExecutor.java | 2 +- .../bramble/test/PairMatcher.java | 2 +- .../bramble/test/TestDatabaseConfig.java | 2 +- .../test/TestDuplexTransportConnection.java | 2 +- .../bramble/test/TestMessageFactory.java | 2 +- .../bramble/test/TestPluginConfigModule.java | 2 +- .../test/TestSecureRandomProvider.java | 2 +- .../test/TestTransportConnectionReader.java | 2 +- .../test/TestTransportConnectionWriter.java | 2 +- .../transport/TestStreamDecrypter.java | 2 +- .../transport/TestStreamEncrypter.java | 2 +- .../lifecycle/WindowsShutdownManagerImpl.java | 2 +- .../bramble/network/JavaNetworkManager.java | 4 +- .../JavaBluetoothConnectionFactory.java | 2 +- .../plugin/bluetooth/JavaBluetoothPlugin.java | 4 +- .../bluetooth/JavaBluetoothPluginFactory.java | 2 +- .../JavaBluetoothTransportConnection.java | 2 +- .../bramble/plugin/modem/Modem.java | 2 +- .../bramble/plugin/modem/ModemFactory.java | 2 +- .../plugin/modem/ModemFactoryImpl.java | 2 +- .../bramble/plugin/modem/ModemImpl.java | 4 +- .../bramble/plugin/modem/ModemPlugin.java | 6 +-- .../plugin/modem/ModemPluginFactory.java | 2 +- .../bramble/plugin/modem/SerialPort.java | 2 +- .../bramble/plugin/modem/SerialPortImpl.java | 2 +- .../bramble/plugin/modem/SerialPortList.java | 2 +- .../plugin/modem/SerialPortListImpl.java | 2 +- .../bramble/plugin/tor/JavaTorPlugin.java | 2 +- .../bramble/plugin/tor/UnixTorPlugin.java | 2 +- .../plugin/tor/UnixTorPluginFactory.java | 2 +- .../bramble/plugin/tor/WindowsTorPlugin.java | 2 +- .../plugin/tor/WindowsTorPluginFactory.java | 2 +- .../bramble/system/JavaLocationUtils.java | 2 +- .../bramble/system/JavaResourceProvider.java | 4 +- .../bramble/plugin/tor/BridgeTest.java | 2 +- .../plugin/tor/TestPluginCallback.java | 2 +- .../android/ScreenshotOnFailureRule.java | 2 +- .../briarproject/briar/android/UiTest.java | 2 +- .../media/PngSuiteImageCompressorTest.java | 2 +- .../PngSuiteImageSizeCalculatorTest.java | 2 +- .../briar/android/AndroidDatabaseConfig.java | 2 +- .../briar/android/AndroidKeyStrengthener.java | 2 +- .../AndroidNotificationManagerImpl.java | 4 +- .../briarproject/briar/android/AppModule.java | 2 +- .../briar/android/BriarService.java | 2 +- .../briar/android/LevelRaisingHandler.java | 2 +- .../briarproject/briar/android/Localizer.java | 2 +- .../android/NetworkUsageMetricsImpl.java | 2 +- .../briar/android/RecentEmojiImpl.java | 4 +- .../android/ScreenFilterMonitorImpl.java | 2 +- .../briar/android/StartupFailureActivity.java | 4 +- .../android/account/AuthorNameFragment.java | 4 +- .../briar/android/account/DozeFragment.java | 4 +- .../briar/android/account/DozeView.java | 2 +- .../android/account/HuaweiAppLaunchView.java | 2 +- .../account/HuaweiProtectedAppsView.java | 2 +- .../android/account/LockManagerImpl.java | 4 +- .../briar/android/account/PowerView.java | 2 +- .../android/account/SetPasswordFragment.java | 4 +- .../briar/android/account/SetupActivity.java | 4 +- .../briar/android/account/SetupFragment.java | 4 +- .../briar/android/account/SetupViewModel.java | 4 +- .../briar/android/account/UnlockActivity.java | 4 +- .../android/account/XiaomiLockAppsView.java | 2 +- .../android/account/XiaomiRecentAppsView.java | 2 +- .../briar/android/activity/BaseActivity.java | 4 +- .../briar/android/activity/BriarActivity.java | 4 +- .../attachment/AttachmentCreationTask.java | 2 +- .../android/attachment/AttachmentCreator.java | 2 +- .../attachment/AttachmentCreatorImpl.java | 2 +- .../attachment/AttachmentDimensions.java | 2 +- .../android/attachment/AttachmentItem.java | 2 +- .../attachment/AttachmentItemResult.java | 2 +- .../android/attachment/AttachmentManager.java | 2 +- .../android/attachment/AttachmentResult.java | 2 +- .../attachment/AttachmentRetriever.java | 2 +- .../attachment/AttachmentRetrieverImpl.java | 2 +- .../android/attachment/media/ImageHelper.java | 2 +- .../attachment/media/ImageHelperImpl.java | 2 +- .../attachment/media/ImageSizeCalculator.java | 2 +- .../media/ImageSizeCalculatorImpl.java | 2 +- .../briar/android/attachment/media/Size.java | 2 +- .../briar/android/blog/BaseViewModel.java | 2 +- .../briar/android/blog/BlogActivity.java | 4 +- .../briar/android/blog/BlogFragment.java | 4 +- .../briar/android/blog/BlogPostAdapter.java | 4 +- .../briar/android/blog/BlogPostFragment.java | 4 +- .../android/blog/BlogPostViewHolder.java | 2 +- .../briar/android/blog/BlogViewModel.java | 4 +- .../briar/android/blog/FeedFragment.java | 4 +- .../briar/android/blog/FeedViewModel.java | 2 +- .../briar/android/blog/ReblogFragment.java | 4 +- .../briar/android/blog/RssFeedActivity.java | 4 +- .../briar/android/blog/RssFeedAdapter.java | 2 +- .../blog/RssFeedDeleteFeedDialogFragment.java | 4 +- .../RssFeedImportFailedDialogFragment.java | 4 +- .../android/blog/RssFeedImportFragment.java | 4 +- .../android/blog/RssFeedManageFragment.java | 6 +-- .../briar/android/blog/RssFeedViewModel.java | 2 +- .../android/blog/WriteBlogPostActivity.java | 4 +- .../briar/android/contact/ContactItem.java | 2 +- .../contact/ContactItemViewHolder.java | 2 +- .../android/contact/ContactListAdapter.java | 4 +- .../android/contact/ContactListFragment.java | 4 +- .../android/contact/ContactListItem.java | 3 +- .../contact/ContactListItemViewHolder.java | 2 +- .../android/contact/ContactListViewModel.java | 2 +- .../android/contact/ContactsViewModel.java | 4 +- .../add/nearby/AddNearbyContactActivity.java | 4 +- .../nearby/AddNearbyContactErrorFragment.java | 4 +- .../add/nearby/AddNearbyContactFragment.java | 4 +- .../nearby/AddNearbyContactIntroFragment.java | 4 +- .../add/nearby/AddNearbyContactViewModel.java | 2 +- .../add/remote/AddContactActivity.java | 4 +- .../add/remote/AddContactViewModel.java | 2 +- .../add/remote/LinkExchangeFragment.java | 4 +- .../contact/add/remote/NicknameFragment.java | 4 +- .../add/remote/PendingContactItem.java | 2 +- .../remote/PendingContactListActivity.java | 4 +- .../add/remote/PendingContactListAdapter.java | 2 +- .../remote/PendingContactListViewModel.java | 2 +- .../add/remote/PendingContactViewHolder.java | 2 +- .../connect/BluetoothIntroFragment.java | 4 +- .../connect/BluetoothProgressFragment.java | 4 +- .../connect/ConnectViaBluetoothActivity.java | 4 +- .../connect/ConnectViaBluetoothViewModel.java | 2 +- .../BaseContactSelectorAdapter.java | 2 +- .../BaseContactSelectorFragment.java | 4 +- .../BaseSelectableContactHolder.java | 2 +- .../ContactSelectorActivity.java | 4 +- .../ContactSelectorAdapter.java | 2 +- .../ContactSelectorController.java | 2 +- .../ContactSelectorControllerImpl.java | 2 +- .../ContactSelectorFragment.java | 4 +- .../ContactSelectorListener.java | 2 +- .../SelectableContactHolder.java | 2 +- .../SelectableContactItem.java | 2 +- .../android/controller/BriarController.java | 2 +- .../controller/BriarControllerImpl.java | 2 +- .../android/controller/DbController.java | 2 +- .../android/controller/DbControllerImpl.java | 2 +- .../handler/UiExceptionHandler.java | 2 +- .../handler/UiResultExceptionHandler.java | 2 +- .../conversation/AliasDialogFragment.java | 4 +- .../conversation/ConversationActivity.java | 4 +- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationItem.java | 2 +- .../ConversationItemDetailsLookup.java | 2 +- .../ConversationItemKeyProvider.java | 2 +- .../ConversationItemViewHolder.java | 2 +- .../conversation/ConversationListener.java | 2 +- .../conversation/ConversationMessageItem.java | 2 +- .../ConversationMessageViewHolder.java | 2 +- .../conversation/ConversationNoticeItem.java | 2 +- .../ConversationNoticeViewHolder.java | 2 +- .../conversation/ConversationRequestItem.java | 2 +- .../ConversationRequestViewHolder.java | 2 +- .../ConversationScrollListener.java | 2 +- .../ConversationSettingsDialog.java | 4 +- .../conversation/ConversationViewModel.java | 2 +- .../conversation/ConversationVisitor.java | 2 +- .../android/conversation/ImageActivity.java | 4 +- .../android/conversation/ImageAdapter.java | 2 +- .../android/conversation/ImageFragment.java | 4 +- .../conversation/ImageItemDecoration.java | 2 +- .../android/conversation/ImageViewHolder.java | 2 +- .../android/conversation/ImageViewModel.java | 2 +- .../conversation/OutItemViewHolder.java | 2 +- .../conversation/glide/BriarDataFetcher.java | 2 +- .../glide/BriarDataFetcherFactory.java | 2 +- .../conversation/glide/BriarGlideModule.java | 2 +- .../conversation/glide/BriarModelLoader.java | 4 +- .../glide/BriarModelLoaderFactory.java | 2 +- .../glide/CustomCornersTransformation.java | 2 +- .../android/conversation/glide/Radii.java | 2 +- .../android/forum/CreateForumActivity.java | 5 +-- .../briar/android/forum/ForumActivity.java | 4 +- .../briar/android/forum/ForumListAdapter.java | 2 +- .../android/forum/ForumListFragment.java | 4 +- .../android/forum/ForumListViewModel.java | 4 +- .../briar/android/forum/ForumViewModel.java | 4 +- .../briar/android/fragment/BaseFragment.java | 4 +- .../briar/android/fragment/ErrorFragment.java | 4 +- .../briar/android/fragment/FinalFragment.java | 4 +- .../fragment/ScreenFilterDialogFragment.java | 4 +- .../android/hotspot/AbstractTabsFragment.java | 4 +- .../android/hotspot/FallbackFragment.java | 6 +-- .../android/hotspot/HotspotActivity.java | 4 +- .../android/hotspot/HotspotErrorFragment.java | 4 +- .../android/hotspot/HotspotFragment.java | 4 +- .../android/hotspot/HotspotHelpFragment.java | 4 +- .../android/hotspot/HotspotIntroFragment.java | 4 +- .../briar/android/hotspot/HotspotManager.java | 4 +- .../briar/android/hotspot/HotspotState.java | 2 +- .../android/hotspot/HotspotViewModel.java | 2 +- .../hotspot/ManualHotspotFragment.java | 4 +- .../android/hotspot/QrHotspotFragment.java | 4 +- .../briar/android/hotspot/WebServer.java | 2 +- .../android/hotspot/WebServerManager.java | 4 +- .../android/hotspot/WebsiteFragment.java | 4 +- .../introduction/ContactChooserFragment.java | 4 +- .../IntroductionMessageFragment.java | 4 +- .../introduction/IntroductionViewModel.java | 2 +- .../android/logging/BriefLogFormatter.java | 2 +- .../android/logging/CachingLogHandler.java | 2 +- .../briar/android/logging/LogDecrypter.java | 2 +- .../android/logging/LogDecrypterImpl.java | 2 +- .../briar/android/logging/LogEncrypter.java | 2 +- .../android/logging/LogEncrypterImpl.java | 2 +- .../login/ChangePasswordViewModel.java | 2 +- .../briar/android/login/LoginUtils.java | 2 +- .../android/login/OpenDatabaseFragment.java | 4 +- .../briar/android/login/PasswordFragment.java | 4 +- .../briar/android/login/StartupActivity.java | 4 +- .../briar/android/login/StartupViewModel.java | 2 +- .../briar/android/logout/SignOutFragment.java | 4 +- .../briar/android/mailbox/ErrorFragment.java | 4 +- .../android/mailbox/ErrorWizardFragment.java | 4 +- .../android/mailbox/MailboxActivity.java | 4 +- .../mailbox/MailboxConnectingFragment.java | 4 +- .../android/mailbox/MailboxScanFragment.java | 4 +- .../mailbox/MailboxStatusFragment.java | 4 +- .../android/mailbox/MailboxViewModel.java | 2 +- .../android/mailbox/OfflineFragment.java | 4 +- .../mailbox/OfflineStatusFragment.java | 4 +- .../mailbox/SetupDownloadFragment.java | 4 +- .../android/mailbox/SetupIntroFragment.java | 4 +- .../android/navdrawer/NavDrawerActivity.java | 4 +- .../android/navdrawer/NavDrawerViewModel.java | 2 +- .../android/navdrawer/PluginViewModel.java | 2 +- .../android/navdrawer/TransportsActivity.java | 4 +- .../android/panic/PanicResponderActivity.java | 4 +- .../conversation/GroupActivity.java | 6 +-- .../conversation/GroupMessageAdapter.java | 2 +- .../conversation/GroupViewModel.java | 4 +- .../JoinMessageItemViewHolder.java | 2 +- .../creation/CreateGroupActivity.java | 4 +- .../creation/CreateGroupController.java | 2 +- .../creation/CreateGroupControllerImpl.java | 4 +- .../creation/CreateGroupFragment.java | 4 +- .../creation/CreateGroupMessageFragment.java | 4 +- .../creation/GroupInviteActivity.java | 4 +- .../creation/GroupInviteFragment.java | 4 +- .../invitation/GroupInvitationActivity.java | 4 +- .../invitation/GroupInvitationController.java | 2 +- .../GroupInvitationControllerImpl.java | 2 +- .../android/privategroup/list/GroupItem.java | 4 +- .../privategroup/list/GroupListAdapter.java | 4 +- .../privategroup/list/GroupListFragment.java | 4 +- .../privategroup/list/GroupListViewModel.java | 4 +- .../privategroup/list/GroupViewHolder.java | 4 +- .../memberlist/GroupMemberListActivity.java | 4 +- .../memberlist/MemberListItem.java | 2 +- .../memberlist/MemberListItemHolder.java | 4 +- .../reveal/RevealContactsActivity.java | 4 +- .../reveal/RevealContactsController.java | 2 +- .../reveal/RevealContactsControllerImpl.java | 2 +- .../reveal/RevealContactsFragment.java | 4 +- .../reveal/RevealableContactAdapter.java | 2 +- .../reveal/RevealableContactItem.java | 2 +- .../reveal/RevealableContactViewHolder.java | 2 +- .../briar/android/qrcode/CameraView.java | 4 +- .../briar/android/qrcode/PreviewConsumer.java | 2 +- .../briar/android/qrcode/QrCodeDecoder.java | 6 +-- .../briar/android/qrcode/QrCodeUtils.java | 2 +- .../removabledrive/ChooserFragment.java | 4 +- .../android/removabledrive/ErrorFragment.java | 4 +- .../removabledrive/ReceiveFragment.java | 4 +- .../RemovableDriveActivity.java | 4 +- .../RemovableDriveViewModel.java | 2 +- .../android/removabledrive/SendFragment.java | 4 +- .../removabledrive/TransferDataState.java | 2 +- .../reporting/BriarExceptionHandler.java | 2 +- .../reporting/BriarReportCollector.java | 2 +- .../android/reporting/CrashFragment.java | 4 +- .../reporting/CrashReportActivity.java | 4 +- .../briar/android/reporting/ReportData.java | 2 +- .../android/reporting/ReportDataAdapter.java | 2 +- .../android/reporting/ReportFormFragment.java | 4 +- .../android/reporting/ReportViewModel.java | 2 +- .../briar/android/settings/AboutFragment.java | 4 +- .../android/settings/AvatarPreference.java | 2 +- .../settings/ConfirmAvatarDialogFragment.java | 4 +- .../android/settings/ConnectionsFragment.java | 4 +- .../android/settings/ConnectionsManager.java | 2 +- .../android/settings/ConnectionsStore.java | 2 +- .../android/settings/DisplayFragment.java | 2 +- .../settings/NotificationsFragment.java | 4 +- .../settings/NotificationsManager.java | 4 +- .../android/settings/OwnIdentityInfo.java | 2 +- .../android/settings/SecurityFragment.java | 4 +- .../android/settings/SettingsActivity.java | 4 +- .../android/settings/SettingsFragment.java | 4 +- .../briar/android/settings/SettingsStore.java | 2 +- .../android/settings/SettingsViewModel.java | 4 +- .../android/settings/TorSummaryProvider.java | 2 +- .../android/sharing/BaseMessageFragment.java | 6 +-- .../sharing/BlogInvitationActivity.java | 4 +- .../sharing/BlogInvitationControllerImpl.java | 2 +- .../sharing/BlogSharingStatusActivity.java | 4 +- .../sharing/ForumInvitationActivity.java | 4 +- .../ForumInvitationControllerImpl.java | 2 +- .../sharing/ForumSharingStatusActivity.java | 4 +- .../android/sharing/InvitationActivity.java | 4 +- .../android/sharing/InvitationController.java | 2 +- .../sharing/InvitationControllerImpl.java | 4 +- .../briar/android/sharing/ShareActivity.java | 4 +- .../android/sharing/ShareBlogActivity.java | 4 +- .../sharing/ShareBlogControllerImpl.java | 2 +- .../android/sharing/ShareBlogFragment.java | 4 +- .../sharing/ShareBlogMessageFragment.java | 4 +- .../android/sharing/ShareForumActivity.java | 4 +- .../sharing/ShareForumControllerImpl.java | 2 +- .../android/sharing/ShareForumFragment.java | 4 +- .../sharing/ShareForumMessageFragment.java | 4 +- .../android/sharing/SharingController.java | 2 +- .../sharing/SharingControllerImpl.java | 2 +- .../sharing/SharingStatusActivity.java | 4 +- .../splash/ExpiredOldAndroidActivity.java | 4 +- .../android/splash/SplashScreenActivity.java | 4 +- .../threaded/BaseThreadItemViewHolder.java | 2 +- .../briar/android/threaded/ThreadItem.java | 4 +- .../android/threaded/ThreadItemAdapter.java | 2 +- .../android/threaded/ThreadListActivity.java | 4 +- .../android/threaded/ThreadListViewModel.java | 4 +- .../threaded/ThreadPostViewHolder.java | 2 +- .../threaded/ThreadScrollListener.java | 2 +- .../briar/android/util/ActivityLaunchers.java | 2 +- .../android/util/BriarSnackbarBuilder.java | 2 +- .../briar/android/util/UiUtils.java | 4 +- .../briar/android/view/BlankFragment.java | 4 +- .../briar/android/view/BriarButton.java | 2 +- .../view/BriarRecyclerViewScrollListener.java | 2 +- .../briar/android/view/ImagePreview.java | 2 +- .../android/view/ImagePreviewAdapter.java | 2 +- .../android/view/ImagePreviewDecoration.java | 2 +- .../briar/android/view/ImagePreviewItem.java | 2 +- .../android/view/ImagePreviewViewHolder.java | 2 +- .../android/view/LargeTextInputView.java | 4 +- .../briar/android/view/PullDownLayout.java | 2 +- .../android/view/SnackbarAwareBehavior.java | 2 +- .../view/TextAttachmentController.java | 2 +- .../briar/android/view/TextInputView.java | 4 +- .../android/view/TextSendController.java | 2 +- .../android/view/UnreadMessageButton.java | 2 +- .../briar/android/viewmodel/DbViewModel.java | 2 +- .../briar/android/viewmodel/LiveEvent.java | 2 +- .../briar/android/viewmodel/LiveResult.java | 2 +- .../android/viewmodel/MutableLiveEvent.java | 2 +- .../android/viewmodel/ViewModelFactory.java | 2 +- .../android/widget/LinkDialogFragment.java | 4 +- .../widget/OnboardingFullDialogFragment.java | 2 +- .../android/widget/TapSafeFrameLayout.java | 2 +- .../widget/TouchInterceptingLinearLayout.java | 2 +- .../api/android/NetworkUsageMetrics.java | 2 +- .../api/android/ScreenFilterMonitor.java | 2 +- .../android/logging/LoggingTestModule.java | 2 +- .../briar/api/attachment/Attachment.java | 2 +- .../api/attachment/AttachmentHeader.java | 2 +- .../api/autodelete/AutoDeleteManager.java | 2 +- .../event/AutoDeleteTimerMirroredEvent.java | 2 +- .../ConversationMessagesDeletedEvent.java | 2 +- .../briar/api/avatar/AvatarManager.java | 2 +- .../api/avatar/event/AvatarUpdatedEvent.java | 2 +- .../org/briarproject/briar/api/blog/Blog.java | 2 +- .../briar/api/blog/BlogCommentHeader.java | 4 +- .../briar/api/blog/BlogFactory.java | 2 +- .../briar/api/blog/BlogInvitationRequest.java | 2 +- .../api/blog/BlogInvitationResponse.java | 2 +- .../briar/api/blog/BlogManager.java | 2 +- .../briarproject/briar/api/blog/BlogPost.java | 2 +- .../briar/api/blog/BlogPostFactory.java | 2 +- .../briar/api/blog/BlogPostHeader.java | 4 +- .../BlogInvitationRequestReceivedEvent.java | 2 +- .../BlogInvitationResponseReceivedEvent.java | 2 +- .../api/blog/event/BlogPostAddedEvent.java | 2 +- .../briar/api/client/BaseGroup.java | 2 +- .../briar/api/client/MessageTracker.java | 2 +- .../briar/api/client/MessageTree.java | 2 +- .../briar/api/client/NamedGroup.java | 2 +- .../briar/api/client/PostHeader.java | 4 +- .../briar/api/client/SessionId.java | 2 +- .../briar/api/client/ThreadedMessage.java | 2 +- .../api/conversation/ConversationManager.java | 2 +- .../ConversationMessageHeader.java | 2 +- .../ConversationMessageVisitor.java | 2 +- .../api/conversation/ConversationRequest.java | 2 +- .../conversation/ConversationResponse.java | 2 +- .../api/conversation/DeletionResult.java | 2 +- .../ConversationMessageReceivedEvent.java | 2 +- .../ConversationMessageTrackedEvent.java | 4 +- .../org/briarproject/briar/api/feed/Feed.java | 2 +- .../briar/api/feed/FeedManager.java | 2 +- .../briarproject/briar/api/forum/Forum.java | 2 +- .../briar/api/forum/ForumFactory.java | 2 +- .../api/forum/ForumInvitationRequest.java | 2 +- .../api/forum/ForumInvitationResponse.java | 2 +- .../briar/api/forum/ForumManager.java | 2 +- .../briar/api/forum/ForumPost.java | 2 +- .../briar/api/forum/ForumPostFactory.java | 2 +- .../briar/api/forum/ForumPostHeader.java | 4 +- .../ForumInvitationRequestReceivedEvent.java | 2 +- .../ForumInvitationResponseReceivedEvent.java | 2 +- .../forum/event/ForumPostReceivedEvent.java | 2 +- .../briar/api/identity/AuthorInfo.java | 4 +- .../briar/api/identity/AuthorManager.java | 2 +- .../api/introduction/IntroductionManager.java | 2 +- .../api/introduction/IntroductionRequest.java | 4 +- .../introduction/IntroductionResponse.java | 2 +- .../briar/api/introduction/Role.java | 2 +- .../event/IntroductionAbortedEvent.java | 2 +- .../IntroductionRequestReceivedEvent.java | 2 +- .../IntroductionResponseReceivedEvent.java | 2 +- .../briar/api/messaging/MessagingManager.java | 2 +- .../briar/api/messaging/PrivateMessage.java | 2 +- .../api/messaging/PrivateMessageFactory.java | 2 +- .../api/messaging/PrivateMessageHeader.java | 2 +- .../event/AttachmentReceivedEvent.java | 2 +- .../event/PrivateMessageReceivedEvent.java | 2 +- .../briar/api/privategroup/GroupMember.java | 2 +- .../briar/api/privategroup/GroupMessage.java | 2 +- .../api/privategroup/GroupMessageFactory.java | 2 +- .../api/privategroup/GroupMessageHeader.java | 4 +- .../api/privategroup/JoinMessageHeader.java | 2 +- .../briar/api/privategroup/MessageType.java | 2 +- .../briar/api/privategroup/PrivateGroup.java | 2 +- .../api/privategroup/PrivateGroupFactory.java | 2 +- .../api/privategroup/PrivateGroupManager.java | 2 +- .../briar/api/privategroup/Visibility.java | 2 +- .../ContactRelationshipRevealedEvent.java | 2 +- .../event/GroupDissolvedEvent.java | 2 +- .../GroupInvitationRequestReceivedEvent.java | 2 +- .../GroupInvitationResponseReceivedEvent.java | 2 +- .../event/GroupMessageAddedEvent.java | 2 +- .../invitation/GroupInvitationFactory.java | 2 +- .../invitation/GroupInvitationItem.java | 2 +- .../invitation/GroupInvitationManager.java | 2 +- .../invitation/GroupInvitationRequest.java | 2 +- .../invitation/GroupInvitationResponse.java | 2 +- .../briar/api/sharing/InvitationItem.java | 2 +- .../briar/api/sharing/Shareable.java | 2 +- .../api/sharing/SharingInvitationItem.java | 2 +- .../briar/api/sharing/SharingManager.java | 2 +- .../event/ContactLeftShareableEvent.java | 2 +- .../briar/api/test/TestDataCreator.java | 2 +- .../briar/attachment/CountingInputStream.java | 2 +- .../autodelete/AutoDeleteManagerImpl.java | 2 +- .../briar/avatar/AvatarManagerImpl.java | 2 +- .../avatar/AvatarMessageEncoderImpl.java | 2 +- .../briar/avatar/AvatarValidator.java | 2 +- .../briar/blog/BlogFactoryImpl.java | 2 +- .../briar/blog/BlogManagerImpl.java | 2 +- .../briar/blog/BlogPostFactoryImpl.java | 2 +- .../briar/blog/BlogPostValidator.java | 2 +- .../briar/client/ConversationClientImpl.java | 2 +- .../briar/client/MessageTrackerImpl.java | 2 +- .../briar/client/MessageTreeImpl.java | 2 +- .../conversation/ConversationManagerImpl.java | 2 +- .../briar/feed/FeedManagerImpl.java | 2 +- .../briar/forum/ForumFactoryImpl.java | 2 +- .../briar/forum/ForumManagerImpl.java | 2 +- .../briar/forum/ForumPostFactoryImpl.java | 2 +- .../briar/forum/ForumPostValidator.java | 2 +- .../briar/identity/AuthorManagerImpl.java | 2 +- .../briar/introduction/AbortMessage.java | 2 +- .../AbstractIntroductionMessage.java | 2 +- .../introduction/AbstractProtocolEngine.java | 2 +- .../briar/introduction/AcceptMessage.java | 2 +- .../briar/introduction/ActivateMessage.java | 2 +- .../briar/introduction/AuthMessage.java | 2 +- .../briar/introduction/DeclineMessage.java | 2 +- .../IntroduceeProtocolEngine.java | 4 +- .../briar/introduction/IntroduceeSession.java | 2 +- .../briar/introduction/IntroduceeState.java | 2 +- .../IntroducerProtocolEngine.java | 2 +- .../briar/introduction/IntroducerSession.java | 2 +- .../briar/introduction/IntroducerState.java | 2 +- .../introduction/IntroductionCryptoImpl.java | 2 +- .../introduction/IntroductionManagerImpl.java | 2 +- .../introduction/IntroductionValidator.java | 2 +- .../briar/introduction/MessageEncoder.java | 2 +- .../introduction/MessageEncoderImpl.java | 2 +- .../briar/introduction/MessageMetadata.java | 2 +- .../briar/introduction/MessageParser.java | 2 +- .../briar/introduction/MessageParserImpl.java | 2 +- .../briar/introduction/MessageType.java | 2 +- .../briar/introduction/PeerSession.java | 2 +- .../briar/introduction/ProtocolEngine.java | 2 +- .../briar/introduction/RequestMessage.java | 2 +- .../briar/introduction/Session.java | 2 +- .../briar/introduction/SessionEncoder.java | 2 +- .../introduction/SessionEncoderImpl.java | 2 +- .../briar/introduction/SessionParser.java | 2 +- .../briar/introduction/SessionParserImpl.java | 2 +- .../briar/messaging/MessagingManagerImpl.java | 2 +- .../messaging/PrivateMessageFactoryImpl.java | 2 +- .../messaging/PrivateMessageValidator.java | 2 +- .../privategroup/GroupMessageFactoryImpl.java | 2 +- .../privategroup/GroupMessageValidator.java | 2 +- .../privategroup/PrivateGroupFactoryImpl.java | 2 +- .../privategroup/PrivateGroupManagerImpl.java | 2 +- .../privategroup/invitation/AbortMessage.java | 2 +- .../invitation/AbstractProtocolEngine.java | 2 +- .../invitation/CreatorProtocolEngine.java | 2 +- .../invitation/CreatorSession.java | 2 +- .../privategroup/invitation/CreatorState.java | 2 +- .../DeletableGroupInvitationMessage.java | 2 +- .../GroupInvitationFactoryImpl.java | 2 +- .../GroupInvitationManagerImpl.java | 2 +- .../invitation/GroupInvitationMessage.java | 2 +- .../invitation/GroupInvitationValidator.java | 2 +- .../invitation/InviteMessage.java | 2 +- .../invitation/InviteeProtocolEngine.java | 2 +- .../invitation/InviteeSession.java | 2 +- .../privategroup/invitation/InviteeState.java | 2 +- .../privategroup/invitation/JoinMessage.java | 2 +- .../privategroup/invitation/LeaveMessage.java | 2 +- .../invitation/MessageEncoder.java | 2 +- .../invitation/MessageEncoderImpl.java | 2 +- .../invitation/MessageMetadata.java | 2 +- .../invitation/MessageParser.java | 2 +- .../invitation/MessageParserImpl.java | 2 +- .../privategroup/invitation/MessageType.java | 2 +- .../invitation/PeerProtocolEngine.java | 2 +- .../privategroup/invitation/PeerSession.java | 2 +- .../privategroup/invitation/PeerState.java | 2 +- .../invitation/ProtocolEngine.java | 2 +- .../invitation/ProtocolEngineFactory.java | 2 +- .../invitation/ProtocolEngineFactoryImpl.java | 2 +- .../briar/privategroup/invitation/Role.java | 2 +- .../privategroup/invitation/Session.java | 2 +- .../invitation/SessionEncoder.java | 2 +- .../invitation/SessionEncoderImpl.java | 2 +- .../invitation/SessionParser.java | 2 +- .../invitation/SessionParserImpl.java | 2 +- .../briar/sharing/AbortMessage.java | 2 +- .../briar/sharing/AcceptMessage.java | 2 +- .../briar/sharing/BlogMessageParserImpl.java | 2 +- .../briar/sharing/BlogProtocolEngineImpl.java | 2 +- .../briar/sharing/BlogSharingManagerImpl.java | 2 +- .../briar/sharing/BlogSharingValidator.java | 2 +- .../briar/sharing/DeclineMessage.java | 2 +- .../briar/sharing/ForumMessageParserImpl.java | 2 +- .../sharing/ForumProtocolEngineImpl.java | 2 +- .../sharing/ForumSharingManagerImpl.java | 2 +- .../briar/sharing/ForumSharingValidator.java | 2 +- .../briar/sharing/InviteMessage.java | 2 +- .../briar/sharing/LeaveMessage.java | 2 +- .../briar/sharing/MessageEncoder.java | 2 +- .../briar/sharing/MessageEncoderImpl.java | 2 +- .../briar/sharing/MessageMetadata.java | 2 +- .../briar/sharing/MessageParser.java | 2 +- .../briar/sharing/MessageParserImpl.java | 2 +- .../briar/sharing/MessageType.java | 2 +- .../briar/sharing/ProtocolEngine.java | 2 +- .../briar/sharing/ProtocolEngineImpl.java | 2 +- .../briarproject/briar/sharing/Session.java | 2 +- .../briar/sharing/SessionEncoder.java | 2 +- .../briar/sharing/SessionEncoderImpl.java | 2 +- .../briar/sharing/SessionParser.java | 2 +- .../briar/sharing/SessionParserImpl.java | 2 +- .../briar/sharing/SharingManagerImpl.java | 2 +- .../briar/sharing/SharingMessage.java | 2 +- .../briar/sharing/SharingValidator.java | 2 +- .../org/briarproject/briar/sharing/State.java | 2 +- .../briar/test/TestDataCreatorImpl.java | 2 +- .../briarproject/briar/util/HtmlUtils.java | 2 +- .../briar/util/ValidationUtils.java | 2 +- .../briar/client/MessageTreeImplTest.java | 2 +- .../IntroductionIntegrationTest.java | 6 +-- .../SimplexMessagingIntegrationTest.java | 2 +- .../sharing/BlogSharingIntegrationTest.java | 2 +- .../sharing/ForumSharingIntegrationTest.java | 2 +- .../briar/test/BriarIntegrationTest.java | 4 +- .../briar/test/TestEventListener.java | 2 +- 1037 files changed, 1244 insertions(+), 1402 deletions(-) delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/FieldsNotNullByDefault.java delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/MethodsNotNullByDefault.java delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NotNullByDefault.java delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/ParametersNotNullByDefault.java diff --git a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java index e1dab1d57..d3db16795 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.system; import android.content.Intent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface AlarmListener { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java index 307a86086..2ef13da48 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface AndroidWakeLock { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java index bd96ef61b..a44a088a5 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java index 11694ba92..3deb3a2a9 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java @@ -21,9 +21,9 @@ import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkStatus; import org.briarproject.bramble.api.network.event.NetworkStatusEvent; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.net.Inet4Address; import java.net.InetAddress; @@ -55,8 +55,8 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothConnectionFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothConnectionFactory.java index b14d5459b..ecc468258 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothConnectionFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothConnectionFactory.java @@ -3,10 +3,10 @@ package org.briarproject.bramble.plugin.bluetooth; import android.bluetooth.BluetoothSocket; import org.briarproject.bramble.api.io.TimeoutMonitor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.system.AndroidWakeLockManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java index bf9259752..70f0229cf 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java @@ -10,8 +10,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; @@ -20,6 +18,8 @@ import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.util.AndroidUtils; import org.briarproject.bramble.util.IoUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.security.SecureRandom; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java index e3a274574..6ea75cb27 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java @@ -6,7 +6,6 @@ import android.bluetooth.BluetoothSocket; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.io.TimeoutMonitor; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -17,6 +16,7 @@ import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.api.system.AndroidWakeLockManager; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; import java.util.concurrent.Executor; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java index b36652cd9..accc2ea5d 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java @@ -3,11 +3,11 @@ package org.briarproject.bramble.plugin.bluetooth; import android.bluetooth.BluetoothSocket; import org.briarproject.bramble.api.io.TimeoutMonitor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection; import org.briarproject.bramble.api.system.AndroidWakeLock; import org.briarproject.bramble.api.system.AndroidWakeLockManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java index 6d325a02f..09a910778 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java @@ -3,9 +3,9 @@ package org.briarproject.bramble.plugin.file; import android.app.Application; import android.net.Uri; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePluginFactory.java index 216d40f48..cad61f9b2 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePluginFactory.java @@ -2,11 +2,11 @@ package org.briarproject.bramble.plugin.file; import android.app.Application; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java index 11e164148..dec03505d 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java @@ -14,10 +14,10 @@ import org.briarproject.bramble.PoliteExecutor; import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.network.event.NetworkStatusEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.net.InetAddress; @@ -43,13 +43,13 @@ import static java.util.Collections.list; import static java.util.Collections.singletonList; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.plugin.LanTcpConstants.DEFAULT_PREF_PLUGIN_ENABLE; import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE; import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.NetworkUtils.getNetworkInterfaces; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class AndroidLanTcpPlugin extends LanTcpPlugin { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java index de3098113..70005b25c 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java @@ -4,7 +4,6 @@ import android.app.Application; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java index 2acd67056..1789ffcb0 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java @@ -7,8 +7,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.AndroidWakeLock; @@ -17,6 +15,8 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.util.AndroidUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.File; import java.io.FileInputStream; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java index ce0e2675b..59d0ff03e 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -19,6 +18,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AlarmConstants.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AlarmConstants.java index b86be5fc6..38099ee0c 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AlarmConstants.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AlarmConstants.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface AlarmConstants { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java index 21d2075c1..22d989027 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java @@ -6,8 +6,8 @@ import android.content.Context; import android.telephony.TelephonyManager; import android.text.TextUtils; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.LocationUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; import java.util.logging.Logger; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java index 89f7f31e3..fdd67dbf3 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java @@ -4,8 +4,8 @@ import android.app.Application; import android.content.Context; import android.content.res.Resources; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java index 66130cc42..0f7ad2835 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java @@ -11,7 +11,7 @@ import android.os.Parcel; import android.os.StrictMode; import android.provider.Settings; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.DataOutputStream; import java.io.IOException; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java index c426f7d6a..b57a91d1f 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java @@ -10,11 +10,11 @@ import android.os.SystemClock; import org.briarproject.bramble.api.Cancellable; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AlarmListener; import org.briarproject.bramble.api.system.AndroidWakeLockManager; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockImpl.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockImpl.java index 625d43760..5da499d1e 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockImpl.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java index 7fd1e80e3..8c0f444e0 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java @@ -5,9 +5,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.PowerManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLock; import org.briarproject.bramble.api.system.AndroidWakeLockManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; @@ -18,7 +18,7 @@ import static android.content.Context.POWER_SERVICE; import static android.os.PowerManager.PARTIAL_WAKE_LOCK; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class AndroidWakeLockManagerImpl implements AndroidWakeLockManager { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java b/bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java index 122180fd6..498c3e8d4 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.system; import android.os.PowerManager; import android.os.PowerManager.WakeLock; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; @@ -18,7 +18,7 @@ import static java.util.logging.Level.FINE; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/SharedWakeLock.java b/bramble-android/src/main/java/org/briarproject/bramble/system/SharedWakeLock.java index db0a07043..d8c430eec 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/SharedWakeLock.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/SharedWakeLock.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLock; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SharedWakeLock { diff --git a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java index bd5f5156b..7e3adef92 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java @@ -8,7 +8,7 @@ import android.os.Looper; import android.provider.Settings; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; @@ -26,7 +26,7 @@ import static android.content.Context.MODE_PRIVATE; import static android.os.Build.VERSION.SDK_INT; import static java.lang.Runtime.getRuntime; import static java.util.Arrays.asList; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault public class AndroidUtils { diff --git a/bramble-api/build.gradle b/bramble-api/build.gradle index 926386b02..667fde15e 100644 --- a/bramble-api/build.gradle +++ b/bramble-api/build.gradle @@ -7,6 +7,8 @@ apply plugin: 'witness' apply from: 'witness.gradle' dependencies { + api 'org.briarproject:null-safety:0.1' + implementation "com.google.dagger:dagger:$dagger_version" implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java index d8a727b71..6b92f91cf 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Arrays; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Consumer.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Consumer.java index 4e025a728..649eb0b68 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Consumer.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Consumer.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface Consumer { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java index 58db606b5..06964afcc 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collections; import java.util.HashMap; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java index 8e6ad4981..d40b3e110 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface Nameable { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java index f41244886..cd81f1adc 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java b/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java index 0bd0520e4..a99eeacec 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface Predicate { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java index 352f4ac8a..c70a48c90 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/WeakSingletonProvider.java b/bramble-api/src/main/java/org/briarproject/bramble/api/WeakSingletonProvider.java index bef7184d8..a564e963a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/WeakSingletonProvider.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/WeakSingletonProvider.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.lang.ref.WeakReference; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java index f33b44594..05dd3c5b3 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.account; import org.briarproject.bramble.api.crypto.DecryptionException; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java index 6dca7a224..46972de40 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java @@ -3,9 +3,9 @@ package org.briarproject.bramble.api.cleanup; import org.briarproject.bramble.api.db.DatabaseComponent; 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.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java index d416d8fed..5f0962dbb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; /** * The CleanupManager is responsible for tracking the cleanup deadlines of diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/CleanupTimerStartedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/CleanupTimerStartedEvent.java index f941cd806..cda531da1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/CleanupTimerStartedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/CleanupTimerStartedEvent.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.cleanup.event; 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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfIncomingMessageHook.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfIncomingMessageHook.java index 8597c0117..f1dd552ef 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfIncomingMessageHook.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfIncomingMessageHook.java @@ -8,10 +8,10 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.Transaction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.validation.IncomingMessageHook; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java index fe238b9e0..5ed72d2a2 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.client; import org.briarproject.bramble.api.data.BdfDictionary; -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.Collections; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java index 3dfde81bf..4caed6438 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageContext; import org.briarproject.bramble.api.sync.validation.MessageValidator; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java index da9ee3163..9ccd18f1d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java @@ -11,12 +11,12 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.mailbox.MailboxUpdate; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; 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; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java index 896acb221..04210c5d8 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.api.client; import org.briarproject.bramble.api.contact.Contact; 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.Group; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface ContactGroupFactory { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java index 63a9b36ae..8750bc253 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java @@ -2,12 +2,12 @@ package org.briarproject.bramble.api.connection; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.sync.OutgoingSessionRecord; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface ConnectionManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java index d23b0144a..125ad99bc 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.api.connection; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent; import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent; import org.briarproject.bramble.api.sync.Priority; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/InterruptibleConnection.java b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/InterruptibleConnection.java index 59b46b1ec..ce5670ea4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/connection/InterruptibleConnection.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/InterruptibleConnection.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.connection; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * A duplex sync connection that can be closed by interrupting its outgoing diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java index 14e890c07..40be25aad 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java index dad6ae6b1..29afba644 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java @@ -3,8 +3,8 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.ContactExistsException; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java index 4a4f138e4..050ee372b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.contact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java index 23fd34ac5..4d4a0ae7e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java @@ -12,7 +12,7 @@ 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.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java index 1f586ada5..990d22a5a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java index 6db81412c..d763c38c5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java index 6a601fbc7..0b89ef5d9 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java index 76550bea3..2cff343de 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAliasChangedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAliasChangedEvent.java index 5972e4113..3ca68a8a1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAliasChangedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAliasChangedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.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.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java index 703c87a85..d76cde614 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java index d2db5985e..547eeec0d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java index f57e6a24e..62dffbfc5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.event; import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java index 4d9c0e281..d349ef980 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.event; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java index 6e7b454c3..de6fb2789 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.contact.event; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.contact.PendingContactState; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java index 3e1cd624e..8fc653bb3 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; import org.briarproject.bramble.api.Bytes; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java index fa595fa4c..3038cdb4c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; import org.briarproject.bramble.api.Bytes; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java index 7dba85835..cf45b4316 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.security.SecureRandom; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/DecryptionException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/DecryptionException.java index 9a2a5333d..6e4487acf 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/DecryptionException.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/DecryptionException.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public class DecryptionException extends Exception { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java index 28b2b1036..d0c87fb01 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java index 7f416d31a..fc0546abb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyStrengthener.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyStrengthener.java index 5913aae5d..607278631 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyStrengthener.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyStrengthener.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * Interface for strengthening a password-based key, for example by using a diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java index f9cf35561..b76f5f737 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface PasswordStrengthEstimator { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java index f53ef5ef8..afda2b2d4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * The private half of a public/private {@link KeyPair}. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java index c091e6e0a..1aa98070d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * The public half of a public/private {@link KeyPair}. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java index 1680d54af..520c72b3c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; import org.briarproject.bramble.api.Bytes; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java index 12b743d10..93bfcf136 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; import org.briarproject.bramble.api.Bytes; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java index 131fb7496..4fa54bb0f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java index 47e97ae00..128159251 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java index 7a1e3ed77..a2bfa2172 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java index 4b68c0441..95759b807 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java index d915a85d2..3fb4b2678 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map.Entry; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java index ad581382f..ab81a39cb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java index ac2551dde..bc41a66d3 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java index 7f02ecbd0..dd191bd23 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.data; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; import java.util.Map; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java index 669c5dfa3..274f9fa80 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java index fe9864a7e..a3d3871ee 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.data; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface MetadataEncoder { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java index 94428e0e5..b3a0abbbb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.data; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface MetadataParser { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java index 191ffb6a7..108868fa8 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.Identity; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.sync.Ack; @@ -27,6 +26,7 @@ import org.briarproject.bramble.api.sync.validation.MessageState; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.TransportKeySet; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java index 16d587c1d..ff1f3b16f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.db; import org.briarproject.bramble.api.crypto.KeyStrengthener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java index 1f024b0dd..6a9db32a3 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface DbCallable { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java index 5d2344e74..a95d58095 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface DbRunnable { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NullableDbCallable.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NullableDbCallable.java index 4ed459118..1f89adb2d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NullableDbCallable.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NullableDbCallable.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/TransactionManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/TransactionManager.java index 2ed25caf3..1806da31a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/TransactionManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/TransactionManager.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.db; import org.briarproject.bramble.api.event.EventExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java index cf57b67ed..444c2ea42 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface EventBus { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java index 20989bfc3..b9f36adf8 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * An interface for receiving notifications when events occur. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java index d6643c252..4e5185efb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.identity; import org.briarproject.bramble.api.Nameable; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java index 162a68aa0..a4ee59220 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.identity; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface AuthorFactory { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java index 6a9d5681d..27aa92806 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.identity; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Identity.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Identity.java index 4d60768eb..227f73268 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Identity.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Identity.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.identity; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java index be2e28d3e..e29be5d88 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface IdentityManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java index 1bc8df84b..e1af5eb1d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.identity; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java index d6f09697e..1b538f92f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.identity.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.identity.AuthorId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java index 1c232c642..781f3cf12 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.identity.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.identity.AuthorId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConnection.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConnection.java index 8a381ae09..95549bcd7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConnection.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConnection.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.keyagreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTask.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTask.java index f5d5150c4..9feaff147 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTask.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTask.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.keyagreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * A task for conducting a key agreement with a remote peer. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/Payload.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/Payload.java index c554d24e9..47d1712c7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/Payload.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/Payload.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.keyagreement; import org.briarproject.bramble.api.Bytes; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java index 4744d4640..5e073318f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.keyagreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface PayloadEncoder { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadParser.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadParser.java index 90403669d..c6458443a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadParser.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadParser.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.keyagreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/TransportDescriptor.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/TransportDescriptor.java index 329bf27ab..858ed720a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/TransportDescriptor.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/TransportDescriptor.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.keyagreement; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java index b0b8bf2c3..89719caed 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.keyagreement.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java index 81950fbcb..c1cc9f628 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.keyagreement.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.keyagreement.KeyAgreementResult; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java index 6d8da3aef..fef244b00 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.keyagreement.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.keyagreement.Payload; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java index 1f5a2c156..8d4a97bbb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java @@ -4,9 +4,9 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseComponent; 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.system.Clock; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.ExecutorService; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/ShutdownManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/ShutdownManager.java index 78e2ee60b..c8a12738c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/ShutdownManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/ShutdownManager.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.lifecycle; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface ShutdownManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/InvalidMailboxIdException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/InvalidMailboxIdException.java index dfb54d84e..0c651e088 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/InvalidMailboxIdException.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/InvalidMailboxIdException.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public class InvalidMailboxIdException extends Exception { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxAuthToken.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxAuthToken.java index d2b932969..73b83e20a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxAuthToken.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxAuthToken.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFileId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFileId.java index 7814658da..d5c713532 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFileId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFileId.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFolderId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFolderId.java index 7a1819d04..632046a04 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFolderId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFolderId.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxHelper.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxHelper.java index 304fded5e..c504853b7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxHelper.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxHelper.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; import java.util.TreeSet; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxId.java index a4ca809f2..ad8257402 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxId.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingTask.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingTask.java index 0f8cd05d7..047cb635e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingTask.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingTask.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.mailbox; import org.briarproject.bramble.api.Consumer; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface MailboxPairingTask extends Runnable { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java index d16cba6b8..b5bb6ffd0 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NullSafety; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NullSafety; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java index e2aab69dc..a47184f07 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxStatus.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxStatus.java index 5b729a7b3..e602f10d4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxStatus.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxStatus.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java index 891a8e5a9..1e285400e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java index 2c82db331..2576f7b6a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java @@ -3,8 +3,8 @@ package org.briarproject.bramble.api.mailbox; 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 javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java index 87cad6b59..8a9e9f1f2 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxVersion.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxVersion.java index 48c40a812..379dffd58 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxVersion.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxVersion.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxPairedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxPairedEvent.java index 1bf89529d..5596d958c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxPairedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxPairedEvent.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxProblemEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxProblemEvent.java index 4c00cac98..1ef3d5db1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxProblemEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxProblemEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.mailbox.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUnpairedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUnpairedEvent.java index 846f8298c..a3ff9cd1b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUnpairedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUnpairedEvent.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.mailbox.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxUpdate; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUpdateSentToNewContactEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUpdateSentToNewContactEvent.java index efba3afd7..28e8be14e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUpdateSentToNewContactEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxUpdateSentToNewContactEvent.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxUpdate; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/OwnMailboxConnectionStatusEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/OwnMailboxConnectionStatusEvent.java index 4a4b6b93e..f256e16ee 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/OwnMailboxConnectionStatusEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/OwnMailboxConnectionStatusEvent.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.mailbox.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxStatus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/RemoteMailboxUpdateEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/RemoteMailboxUpdateEvent.java index aeee7da39..41340f0ef 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/RemoteMailboxUpdateEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/RemoteMailboxUpdateEvent.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.mailbox.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.mailbox.MailboxUpdate; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java index f95eddc7d..872a32060 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.network; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface NetworkManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java b/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java index 348c29f0d..dbebeab6b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.network; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java index f37bff94d..4ed8e9ddb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.network.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.network.NetworkStatus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/FieldsNotNullByDefault.java b/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/FieldsNotNullByDefault.java deleted file mode 100644 index 54d04f43f..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/FieldsNotNullByDefault.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.briarproject.bramble.api.nullsafety; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * This annotation can be applied to a package or class to indicate that - * the fields in that element are non-null by default unless: - *
    - *
  • There is an explicit nullness annotation - *
  • There is a default nullness annotation applied to a more tightly - * nested element. - *
- */ -@Documented -@Nonnull -@TypeQualifierDefault(FIELD) -@Retention(RUNTIME) -public @interface FieldsNotNullByDefault { -} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/MethodsNotNullByDefault.java b/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/MethodsNotNullByDefault.java deleted file mode 100644 index 9fbfe4f0b..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/MethodsNotNullByDefault.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.briarproject.bramble.api.nullsafety; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * This annotation can be applied to a package or class to indicate that - * the methods in that element are non-null by default unless: - *
    - *
  • There is an explicit nullness annotation - *
  • The method overrides a method in a superclass (in which case the - * annotation of the corresponding method in the superclass applies) - *
  • There is a default nullness annotation applied to a more tightly - * nested element. - *
- */ -@Documented -@Nonnull -@TypeQualifierDefault(METHOD) -@Retention(RUNTIME) -public @interface MethodsNotNullByDefault { -} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NotNullByDefault.java b/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NotNullByDefault.java deleted file mode 100644 index 23fd38c7e..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NotNullByDefault.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.briarproject.bramble.api.nullsafety; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * This annotation can be applied to a package or class to indicate that - * the fields, methods and parameters in that element are non-null by default - * unless: - *
    - *
  • There is an explicit nullness annotation - *
  • The method overrides a method in a superclass (in which case the - * annotation of the corresponding method or parameter in the superclass - * applies) - *
  • There is a default nullness annotation applied to a more tightly - * nested element. - *
- */ -@Documented -@Nonnull -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Retention(RUNTIME) -public @interface NotNullByDefault { -} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java b/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java deleted file mode 100644 index e54bad748..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.briarproject.bramble.api.nullsafety; - -import javax.annotation.Nullable; - -@NotNullByDefault -public class NullSafety { - - /** - * Stand-in for {@code Objects.requireNonNull()}. - */ - public static T requireNonNull(@Nullable T t) { - if (t == null) throw new NullPointerException(); - return t; - } - - /** - * Checks that exactly one of the arguments is null. - * - * @throws AssertionError If both or neither of the arguments are null - */ - public static void requireExactlyOneNull(@Nullable Object a, - @Nullable Object b) { - if ((a == null) == (b == null)) throw new AssertionError(); - } - - /** - * Checks that the argument is null. - */ - public static void requireNull(@Nullable Object o) { - if (o != null) throw new AssertionError(); - } - - /** - * Stand-in for {@code Objects.equals()}. - */ - public static boolean equals(@Nullable Object a, @Nullable Object b) { - return (a == b) || (a != null && a.equals(b)); - } - -} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/ParametersNotNullByDefault.java b/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/ParametersNotNullByDefault.java deleted file mode 100644 index eb183de2e..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/ParametersNotNullByDefault.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.briarproject.bramble.api.nullsafety; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * This annotation can be applied to a package or class to indicate that - * the method parameters in that element are non-null by default unless: - *
    - *
  • There is an explicit nullness annotation - *
  • The method overrides a method in a superclass (in which case the - * annotation of the corresponding parameter in the superclass applies) - *
  • There is a default nullness annotation applied to a more tightly - * nested element. - *
- */ -@Documented -@Nonnull -@TypeQualifierDefault(PARAMETER) -@Retention(RUNTIME) -public @interface ParametersNotNullByDefault { -} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionHandler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionHandler.java index 17e7d0f59..967548464 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionHandler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionHandler.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; +import org.briarproject.nullsafety.NotNullByDefault; /** * An interface for handling connections created by transport plugins. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java index 0ace3778a..8a93d40eb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.api.plugin; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginCallback.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginCallback.java index 3c0f3ca4d..fc4d89ab9 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginCallback.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginCallback.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.plugin.event.TransportStateEvent; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java index 61063030c..46690824c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginFactory.java index d0cf92e9b..6a4bd9468 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginManager.java index 5132ba3c6..2146d06a5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginManager.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionReader.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionReader.java index 941bb59d8..786da48ec 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionReader.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionReader.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionWriter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionWriter.java index 540e56acc..f755752e1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionWriter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportConnectionWriter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/AbstractDuplexTransportConnection.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/AbstractDuplexTransportConnection.java index 157a03344..a3bfab974 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/AbstractDuplexTransportConnection.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/AbstractDuplexTransportConnection.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.api.plugin.duplex; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java index 9e14e7ab5..ea9445f66 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java @@ -2,13 +2,13 @@ package org.briarproject.bramble.api.plugin.duplex; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPluginFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPluginFactory.java index 991747494..18cbad2a4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPluginFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPluginFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.plugin.duplex; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; /** * Factory for creating a plugin for a duplex transport. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java index d0e98bfba..d49438c86 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.plugin.duplex; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; /** * An interface for reading and writing data over a duplex transport. The diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionClosedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionClosedEvent.java index 6d5e5293b..04b2ade66 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionClosedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionClosedEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionOpenedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionOpenedEvent.java index ba21c185d..c51a4df85 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionOpenedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ConnectionOpenedEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactConnectedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactConnectedEvent.java index 46f6b46bc..daaf625fc 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactConnectedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactConnectedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactDisconnectedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactDisconnectedEvent.java index 77b176484..2cb02eb7e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactDisconnectedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/ContactDisconnectedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java index de9c49c90..4618c3735 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java index e2167c0f5..fa8b45cef 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java index 376b5303f..9aa5aab37 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveManager.java index 2838f87cf..1c78297b7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveManager.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.plugin.file; 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.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveTask.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveTask.java index 606727160..78e29738b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveTask.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/file/RemovableDriveTask.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.plugin.file; import org.briarproject.bramble.api.Consumer; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface RemovableDriveTask extends Runnable { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPlugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPlugin.java index f7cf1e801..eb492fdc5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPlugin.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPlugin.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.api.plugin.simplex; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginFactory.java index 2b345d510..cd1c53af3 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.plugin.simplex; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; /** * Factory for creating a plugin for a simplex transport. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java index de10f2aca..d000f19ef 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java @@ -3,9 +3,9 @@ package org.briarproject.bramble.api.properties; 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.plugin.TransportId; import org.briarproject.bramble.api.sync.ClientId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/event/RemoteTransportPropertiesUpdatedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/event/RemoteTransportPropertiesUpdatedEvent.java index 89b7ec131..ea609fd0d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/event/RemoteTransportPropertiesUpdatedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/event/RemoteTransportPropertiesUpdatedEvent.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.properties.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java b/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java index fedb7212c..3e910ce28 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.record; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java index 14756860c..ada8f1940 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.record; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.Predicate; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java index 893e5ff53..8e0319bda 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.record; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java index 6a8176516..58d50e7dd 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayer.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayer.java index bdf066bee..78e9c4e82 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayer.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayer.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java index 89a06a07f..1e2b73fd5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface ReliabilityLayerFactory { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java index 395e208a7..a35d478bf 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/KeyMaterialSource.java b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/KeyMaterialSource.java index 87d1960da..8ab55610a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/KeyMaterialSource.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/KeyMaterialSource.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.rendezvous; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * A source of key material for use in making rendezvous connections. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionClosedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionClosedEvent.java index c9ec9ac76..e2b593eb1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionClosedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionClosedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.rendezvous.event; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionOpenedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionOpenedEvent.java index 5324c081d..cdb365de7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionOpenedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousConnectionOpenedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.rendezvous.event; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousPollEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousPollEvent.java index 0281a9017..9dcbe505e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousPollEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/event/RendezvousPollEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.rendezvous.event; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java index 8c7c89000..41f6edd19 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.reporting; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java index 392886a2f..97ee57a52 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.reporting; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileNotFoundException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java index 731664018..d2eaa9f62 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.settings; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface SettingsManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java index e8f57c4cb..f75afbc4f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.settings.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Ack.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Ack.java index 0f21a64ea..001211ee2 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Ack.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Ack.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java index a0f4e6675..cb509caea 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java index 9924c51b8..f5219db96 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface GroupFactory { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java index 6cfef9076..9600aa016 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.sync; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java index b2f30debd..3ec71b072 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java index c47718c16..888ada18f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.sync; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.Collections; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java index cab854381..4423abf2d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface MessageFactory { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java index d25584eba..7b3a2ab6e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.sync; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java index 6cfeb5b04..2f3e316f5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/OutgoingSessionRecord.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/OutgoingSessionRecord.java index 6f1077a23..5de9559f0 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/OutgoingSessionRecord.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/OutgoingSessionRecord.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Priority.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Priority.java index 44a2169b7..49dc47ccb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Priority.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Priority.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/PriorityHandler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/PriorityHandler.java index 57b2bcf98..b490ea117 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/PriorityHandler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/PriorityHandler.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * An interface for handling a {@link Priority} record received by an diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java index f4e6e1f2c..c3a51c1e2 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java index c0f9b947a..354340fa7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java index 1f66bdbad..19d738391 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java index 4234f50fb..9f02547de 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java index 32c7c0c36..4ee72ccfb 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncSessionFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncSessionFactory.java index 65250938f..e3660dd3d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncSessionFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncSessionFactory.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.sync; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Versions.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Versions.java index 9517d02e6..9d9606934 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Versions.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Versions.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/CloseSyncConnectionsEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/CloseSyncConnectionsEvent.java index 92d2b3c19..22d75a6e8 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/CloseSyncConnectionsEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/CloseSyncConnectionsEvent.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.sync.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java index 3ff5b795c..9b92fe515 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.sync.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java index 980454716..8520a52a5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.sync.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java index 7d151a48d..570db5e0a 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.sync.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.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java index 960dddc66..3c649b357 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.api.sync.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.bramble.api.sync.Message; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java index eab140542..fd4b09073 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.sync.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java index d7ef7d802..4d5e8205b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.api.sync.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.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageStateChangedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageStateChangedEvent.java index 7a6829e7c..7bac4e52f 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageStateChangedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageStateChangedEvent.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.sync.event; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.validation.MessageState; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java index cc35d59a9..dcf2f4302 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.sync.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToRequestEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToRequestEvent.java index e1a7fb969..36989ccc9 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToRequestEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToRequestEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.sync.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java index fb1b1dd21..47190a1fd 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.sync.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesSentEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesSentEvent.java index 179907a3a..df741cb35 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesSentEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesSentEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.sync.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; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java index 00d1f5b7b..ed46dff00 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.api.sync.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 java.util.List; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/validation/ValidationManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/validation/ValidationManager.java index fcaa5ee77..1951a7342 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/validation/ValidationManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/validation/ValidationManager.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.sync.validation; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; +import org.briarproject.nullsafety.NotNullByDefault; /** * Responsible for managing message validators and passing them messages to diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java index 61a83d95c..4b3e1be3b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface LocationUtils { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/ResourceProvider.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/ResourceProvider.java index e4bf0b63c..1642e7b29 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/ResourceProvider.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/ResourceProvider.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java index 7d821ba2c..b0ab9e0b6 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.Provider; import java.security.SecureRandom; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java index 8c3b599b2..0ebe69db9 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.system; import org.briarproject.bramble.api.Cancellable; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/IncomingKeys.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/IncomingKeys.java index 465dec55a..de2862d4d 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/IncomingKeys.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/IncomingKeys.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java index fb6a929df..7fe7aad38 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.api.transport; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java index 9fa6245d0..0856b8773 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamContext.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamContext.java index c27abc891..7ef481023 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamContext.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamContext.java @@ -3,13 +3,13 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull; +import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull; @Immutable @NotNullByDefault diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java index dc60242f8..8ee274a2c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java index 6090a7d14..b81285340 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeySet.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeySet.java index 7a3b1dc12..81bef3a39 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeySet.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeySet.java @@ -2,12 +2,12 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull; +import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull; /** * A set of keys for communicating with a given contact or pending contact diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeys.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeys.java index 200f05bd1..60c98b174 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeys.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeys.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/agreement/TransportKeyAgreementManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/agreement/TransportKeyAgreementManager.java index 1b8fc6bc1..dc2288783 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/agreement/TransportKeyAgreementManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/agreement/TransportKeyAgreementManager.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.transport.agreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface TransportKeyAgreementManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java index d57eb987e..87284a5af 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.versioning; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersion.java b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersion.java index 719c1e38c..266413224 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersion.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersion.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.versioning; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java index 53baed068..6b299d611 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java @@ -6,9 +6,9 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface ClientVersioningManager { diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/event/ClientVersionUpdatedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/event/ClientVersionUpdatedEvent.java index 0e9985c77..0718cda3e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/event/ClientVersionUpdatedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/event/ClientVersionUpdatedEvent.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.api.versioning.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.versioning.ClientVersion; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java index 3c07f76c3..b37dbdbb6 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.Closeable; import java.io.EOFException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/NetworkUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/NetworkUtils.java index f6a4cdc83..dd1538ef6 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/NetworkUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/NetworkUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.net.NetworkInterface; import java.net.SocketException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java index 8821838ef..99bac6951 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/PrivacyUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/PrivacyUtils.java index 10df6686c..c39fc5e86 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/PrivacyUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/PrivacyUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java index e98d2b648..2797aaf72 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.util; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java index 346edc1f7..097480fb5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.util; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/PoliteExecutor.java b/bramble-core/src/main/java/org/briarproject/bramble/PoliteExecutor.java index 152210598..885a4e20e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/PoliteExecutor.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/PoliteExecutor.java @@ -1,6 +1,6 @@ package org.briarproject.bramble; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.LinkedList; import java.util.Queue; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/TimeLoggingExecutor.java b/bramble-core/src/main/java/org/briarproject/bramble/TimeLoggingExecutor.java index c786d1b96..dc0b96d3d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/TimeLoggingExecutor.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/TimeLoggingExecutor.java @@ -1,6 +1,6 @@ package org.briarproject.bramble; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.BlockingQueue; import java.util.concurrent.RejectedExecutionHandler; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java index 3410c394f..879c4505b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java @@ -9,9 +9,9 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.util.IoUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.BufferedReader; import java.io.File; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java index 4c88e57c7..39a3be88f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupId; @@ -18,6 +17,7 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.api.versioning.ClientMajorVersion; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.HashSet; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java index 35a8ddb73..1e1939cd8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java @@ -29,7 +29,6 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxUpdate; import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.GroupId; @@ -37,6 +36,7 @@ import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.util.Base32; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java index 091bc95f7..d3475b8f7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java @@ -6,10 +6,10 @@ import org.briarproject.bramble.api.client.ContactGroupFactory; import org.briarproject.bramble.api.contact.Contact; 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.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java index 9db61721c..614c895ef 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; @@ -10,6 +9,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java index f3224e5db..096c10961 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; @@ -18,6 +17,7 @@ import org.briarproject.bramble.api.sync.SyncSessionFactory; import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java index 2e551f520..6b39b89b0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.connection.InterruptibleConnection; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent; import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent; import org.briarproject.bramble.api.sync.Priority; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java index 33b90c68f..127f05ae9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.connection.InterruptibleConnection; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; @@ -18,6 +17,7 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.concurrent.Executor; @@ -25,7 +25,7 @@ import java.util.concurrent.Executor; import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault abstract class DuplexSyncConnection extends SyncConnection diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java index 7405bbe2e..df5d84a8c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; @@ -15,6 +14,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java index abf34ca0f..2238df97a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; 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.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java index d919c1bd4..2fd4354f3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.HandshakeManager.HandshakeResult; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.transport.KeyManager; @@ -15,6 +14,7 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java index 68b9d969c..705661d6a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.connection.ConnectionManager.TagController; import org.briarproject.bramble.api.connection.ConnectionRegistry; 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.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java index d7f777b7b..61a2a43c5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; 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.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -15,6 +14,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.security.SecureRandom; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java index 7a2e5264e..a59edf450 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.HandshakeManager.HandshakeResult; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.transport.KeyManager; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java index d128d9d71..943851ab4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -14,14 +13,15 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import javax.annotation.Nullable; import static java.util.logging.Level.WARNING; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class OutgoingSimplexSyncConnection extends SyncConnection implements Runnable { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java index 6de535552..2db5deda5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.connection; import org.briarproject.bramble.api.connection.ConnectionRegistry; 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.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; @@ -21,8 +21,8 @@ import java.io.InputStream; import javax.annotation.Nullable; import static java.util.logging.Level.WARNING; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class SyncConnection extends Connection { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCrypto.java index 5c21eb23a..e3c0e5500 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCrypto.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCrypto.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.contact; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface ContactExchangeCrypto { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java index 6a3a3c44a..1f376f8ca 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java index 27870ca23..5040cf959 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java @@ -18,7 +18,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; @@ -32,6 +31,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java index 3319258e6..d460736ea 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java @@ -21,8 +21,8 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.KeyManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java index bab35e6d1..b7bf351ca 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.contact; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java index 199bf16af..f5ebb5e1d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java index 7edeaf786..acd1c80e7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java @@ -16,13 +16,13 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordReader; import org.briarproject.bramble.api.record.RecordReaderFactory; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.api.record.RecordWriterFactory; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java index 7b966aa2f..525f74fff 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.AgreementPublicKey; import org.briarproject.bramble.api.crypto.KeyParser; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AsciiArmour.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AsciiArmour.java index 2bf79875e..c6cb67133 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AsciiArmour.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AsciiArmour.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class AsciiArmour { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AuthenticatedCipher.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AuthenticatedCipher.java index b70358e5d..677c6876d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/AuthenticatedCipher.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AuthenticatedCipher.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java index 0d1577798..c81ef00d0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java @@ -21,11 +21,11 @@ import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.SignaturePrivateKey; import org.briarproject.bramble.api.crypto.SignaturePublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.SecureRandomProvider; import org.briarproject.bramble.util.Base32; import org.briarproject.bramble.util.ByteUtils; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import org.whispersystems.curve25519.Curve25519; import org.whispersystems.curve25519.Curve25519KeyPair; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java index aeb95836f..4094f6933 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java @@ -10,7 +10,7 @@ import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.security.NoSuchAlgorithmException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/FrameEncoder.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/FrameEncoder.java index b56119b24..d2e4f0165 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/FrameEncoder.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/FrameEncoder.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import static org.briarproject.bramble.api.transport.TransportConstants.FRAME_HEADER_PLAINTEXT_LENGTH; import static org.briarproject.bramble.api.transport.TransportConstants.FRAME_NONCE_LENGTH; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/MessageEncrypter.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/MessageEncrypter.java index a9494c957..3e00e2d1b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/MessageEncrypter.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/MessageEncrypter.java @@ -31,8 +31,8 @@ import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.KeyParser; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java index 04c52ac9f..2cde3c56e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashSet; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1KeyParser.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1KeyParser.java index 979551275..dc6d6d19b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1KeyParser.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1KeyParser.java @@ -8,7 +8,7 @@ import org.bouncycastle.math.ec.ECPoint; import org.briarproject.bramble.api.crypto.KeyParser; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.math.BigInteger; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PrivateKey.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PrivateKey.java index 086159757..4bd8279d1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PrivateKey.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PrivateKey.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.crypto; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; import org.briarproject.bramble.api.crypto.PrivateKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PublicKey.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PublicKey.java index c22fe6fbb..5b310ab5d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PublicKey.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1PublicKey.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.crypto; import org.bouncycastle.crypto.params.ECPublicKeyParameters; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1Utils.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1Utils.java index f87d72700..eb6594d6e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1Utils.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Sec1Utils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class Sec1Utils { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Signature.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Signature.java index 8cfc20fae..10f1724f7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Signature.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Signature.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java index 4e7b38c5b..37a6f794c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SignaturePrivateKey; import org.briarproject.bramble.api.crypto.SignaturePublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java index 093136662..579944a5a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java @@ -3,8 +3,8 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamDecrypter; import org.briarproject.bramble.api.crypto.StreamDecrypterFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterImpl.java index 16edc2c74..e97eff0a1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterImpl.java @@ -3,8 +3,8 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamDecrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java index ae8db9fb7..fb49c1830 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java @@ -5,8 +5,8 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamEncrypter; import org.briarproject.bramble.api.crypto.StreamEncrypterFactory; import org.briarproject.bramble.api.crypto.TransportCrypto; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java index 2a060b03f..55224c729 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamEncrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipher.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipher.java index 5b89fd40b..700c316ac 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipher.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipher.java @@ -7,7 +7,7 @@ import org.bouncycastle.crypto.macs.Poly1305; import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.ParametersWithIV; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderFactoryImpl.java index 758ac5eb9..48d61ca63 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderFactoryImpl.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.data; import org.briarproject.bramble.api.data.BdfReader; import org.briarproject.bramble.api.data.BdfReaderFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java index 788826a57..d5badb88e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfReader; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterFactoryImpl.java index 252ed843c..92f907367 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterFactoryImpl.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.data; import org.briarproject.bramble.api.data.BdfWriter; import org.briarproject.bramble.api.data.BdfWriterFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterImpl.java index e9979e9ff..aa862e572 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterImpl.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.data; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfWriter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataEncoderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataEncoderImpl.java index 7605b1da7..f28b8637e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataEncoderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataEncoderImpl.java @@ -7,7 +7,7 @@ import org.briarproject.bramble.api.data.BdfWriter; import org.briarproject.bramble.api.data.BdfWriterFactory; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataParserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataParserImpl.java index 217a9425e..3056975c1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataParserImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/data/MetadataParserImpl.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.data.BdfReader; import org.briarproject.bramble.api.data.BdfReaderFactory; import org.briarproject.bramble.api.data.MetadataParser; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java b/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java index 4522bf5e4..418770eac 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.db.MigrationListener; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.Identity; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.sync.ClientId; @@ -31,6 +30,7 @@ import org.briarproject.bramble.api.sync.validation.MessageState; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.TransportKeySet; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java index 2353bf4f6..09ae70b86 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java @@ -42,7 +42,6 @@ import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.event.IdentityAddedEvent; import org.briarproject.bramble.api.identity.event.IdentityRemovedEvent; import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; @@ -72,6 +71,7 @@ import org.briarproject.bramble.api.sync.validation.MessageState; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.TransportKeySet; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java b/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java index 7fad1c3fd..ce9a6912c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java @@ -5,10 +5,10 @@ import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbClosedException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.MigrationListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.sql.Connection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java index 64dd03e04..91a22531c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java @@ -5,10 +5,10 @@ import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbClosedException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.MigrationListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.sql.Connection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java index 6085ec50a..2c8052bc8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java @@ -22,7 +22,6 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.sync.ClientId; @@ -40,6 +39,7 @@ import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.OutgoingKeys; import org.briarproject.bramble.api.transport.TransportKeySet; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.nullsafety.NotNullByDefault; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcUtils.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcUtils.java index 52cc60820..e1e419f6d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcUtils.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcUtils.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.sql.Connection; import java.sql.ResultSet; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java index 4b1bd20af..e8274f14d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/identity/AuthorFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/identity/AuthorFactoryImpl.java index 85885414f..5b812d456 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/identity/AuthorFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/identity/AuthorFactoryImpl.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorFactory; 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; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java index d5d5e0b6f..608771728 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java @@ -12,8 +12,8 @@ import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.logging.Logger; @@ -23,9 +23,9 @@ import javax.annotation.concurrent.ThreadSafe; import javax.inject.Inject; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.now; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java b/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java index 91a8616ed..dafc7f428 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.io; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java index 1a433254f..68c33b107 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.io; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java index 5b69243e1..5cbaa4a0a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.keyagreement; import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java index 23af3589e..8efba939b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.keyagreement.Payload; import org.briarproject.bramble.api.keyagreement.TransportDescriptor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.Plugin; @@ -18,6 +17,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.record.RecordReaderFactory; import org.briarproject.bramble.api.record.RecordWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java index 682041c90..a5ea1a09d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.keyagreement.Payload; import org.briarproject.bramble.api.keyagreement.PayloadEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java index e2735c394..502eb25a8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java @@ -16,11 +16,11 @@ import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEven import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStartedEvent; import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStoppedListeningEvent; import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.record.RecordReaderFactory; import org.briarproject.bramble.api.record.RecordWriterFactory; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java index f3c19076d..e5e1e2ca3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.keyagreement; import org.briarproject.bramble.api.Predicate; import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.record.Record; @@ -10,6 +9,7 @@ import org.briarproject.bramble.api.record.RecordReader; import org.briarproject.bramble.api.record.RecordReaderFactory; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.api.record.RecordWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadEncoderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadEncoderImpl.java index 663044898..b0ee035e5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadEncoderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadEncoderImpl.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.api.data.BdfWriterFactory; import org.briarproject.bramble.api.keyagreement.Payload; import org.briarproject.bramble.api.keyagreement.PayloadEncoder; import org.briarproject.bramble.api.keyagreement.TransportDescriptor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java index f574360a7..585516c64 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java @@ -8,10 +8,10 @@ import org.briarproject.bramble.api.data.BdfReaderFactory; import org.briarproject.bramble.api.keyagreement.Payload; import org.briarproject.bramble.api.keyagreement.PayloadParser; import org.briarproject.bramble.api.keyagreement.TransportDescriptor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java index bd2a35b99..c6a2ed395 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java @@ -11,8 +11,8 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java index f5f422c4a..5bbea8acc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.lifecycle; import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashMap; import java.util.Map; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityChecker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityChecker.java index d0a6ab57d..d0bf32c54 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityChecker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityChecker.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImpl.java index aa3e97930..b445e41b0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImpl.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.Cancellable; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxClient.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxClient.java index ef880bc08..f78a6a1da 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxClient.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxClient.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java index e29eb5e5c..a5deb6a07 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorker.java index 2b1bad8fd..cdfdefa2b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorker.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.LinkedList; @@ -15,7 +15,7 @@ import java.util.Queue; import javax.annotation.concurrent.ThreadSafe; import static java.util.Collections.emptyList; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java index 2939ab968..adc819c18 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.mailbox.MailboxFileId; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCaller.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCaller.java index 3da4616ed..0316a20a1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCaller.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCaller.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.Cancellable; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCallerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCallerImpl.java index fd625b084..ce08b2f25 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCallerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCallerImpl.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.Cancellable; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java index 8ae436a61..a7ad6108e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java @@ -15,7 +15,7 @@ import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxId; import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileOutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClient.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClient.java index 24a621030..942047efc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClient.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClient.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactory.java index f147a206d..5b3225c4d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface MailboxClientFactory { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactoryImpl.java index 4e6e11580..3f5bb4382 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientFactoryImpl.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientManager.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientManager.java index fe91f1b32..8e28e3781 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientManager.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientManager.java @@ -24,11 +24,11 @@ import org.briarproject.bramble.api.mailbox.event.MailboxUnpairedEvent; import org.briarproject.bramble.api.mailbox.event.MailboxUpdateSentToNewContactEvent; import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent; import org.briarproject.bramble.api.mailbox.event.RemoteMailboxUpdateEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashMap; import java.util.List; @@ -47,10 +47,10 @@ import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS; import static org.briarproject.bramble.api.mailbox.MailboxHelper.isClientCompatibleWithServer; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; import static org.briarproject.bramble.api.plugin.TorConstants.ID; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; /** * This component manages a {@link MailboxClient} for each mailbox we know diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxDownloadWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxDownloadWorker.java index faf39752f..59d5bf1e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxDownloadWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxDownloadWorker.java @@ -4,11 +4,11 @@ import org.briarproject.bramble.api.Cancellable; import org.briarproject.bramble.api.mailbox.MailboxFileId; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; import org.briarproject.bramble.mailbox.TorReachabilityMonitor.TorReachabilityObserver; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManager.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManager.java index 91553a7d6..1def99404 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManager.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManager.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.OutgoingSessionRecord; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManagerImpl.java index 82c7c47cb..a84bc572e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxFileManagerImpl.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.mailbox.MailboxDirectory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.OutgoingSessionRecord; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; @@ -34,10 +34,10 @@ import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING; import static org.briarproject.bramble.api.mailbox.MailboxConstants.ID; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.plugin.file.FileConstants.PROP_PATH; import static org.briarproject.bramble.util.IoUtils.delete; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java index 753e7cfef..5913a883b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java @@ -10,8 +10,8 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxStatus; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactory.java index 749a7f31c..871da79ac 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactory.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxPairingTask; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface MailboxPairingTaskFactory { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactoryImpl.java index c688fc511..d90f05d90 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactoryImpl.java @@ -6,8 +6,8 @@ import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.mailbox.MailboxPairingTask; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java index 4335b614a..544a38bf1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java @@ -14,10 +14,10 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxUpdate; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.MailboxAlreadyPairedException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.nio.charset.Charset; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java index 62dc1e584..ed1f9895e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java @@ -11,9 +11,9 @@ import org.briarproject.bramble.api.mailbox.MailboxStatus; import org.briarproject.bramble.api.mailbox.MailboxVersion; import org.briarproject.bramble.api.mailbox.event.MailboxProblemEvent; import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImpl.java index 50e29c802..7c584afb2 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImpl.java @@ -29,7 +29,6 @@ import org.briarproject.bramble.api.mailbox.event.MailboxPairedEvent; import org.briarproject.bramble.api.mailbox.event.MailboxUnpairedEvent; import org.briarproject.bramble.api.mailbox.event.MailboxUpdateSentToNewContactEvent; import org.briarproject.bramble.api.mailbox.event.RemoteMailboxUpdateEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; @@ -40,6 +39,7 @@ import org.briarproject.bramble.api.sync.validation.IncomingMessageHook; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashMap; import java.util.List; @@ -51,8 +51,8 @@ import javax.inject.Inject; import static java.util.Collections.emptyList; import static org.briarproject.bramble.api.data.BdfDictionary.NULL_VALUE; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.sync.validation.IncomingMessageHook.DeliveryAction.ACCEPT_DO_NOT_SHARE; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class MailboxUpdateManagerImpl implements MailboxUpdateManager, diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateValidator.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateValidator.java index e717f911f..a6c537f06 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateValidator.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateValidator.java @@ -7,11 +7,11 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUploadWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUploadWorker.java index b3f4ead6b..443125db9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUploadWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUploadWorker.java @@ -12,7 +12,6 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.sync.MessageId; @@ -24,6 +23,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorker.java index 75b0f7ce7..e1e58d3db 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorker.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactory.java index dc36443d0..6e3604961 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactory.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactoryImpl.java index 7fff2782c..d77fad407 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxWorkerFactoryImpl.java @@ -8,9 +8,9 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxClient.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxClient.java index 24b7b2760..b190a247d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxClient.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxClient.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.HashMap; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityChecker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityChecker.java index 1882cc5f4..c955c9527 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityChecker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityChecker.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxVersion; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorker.java index 5fb674f72..6c8d6be25 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorker.java @@ -17,11 +17,11 @@ import org.briarproject.bramble.api.mailbox.MailboxProperties; import org.briarproject.bramble.api.mailbox.MailboxUpdate; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.MailboxContact; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.Collection; @@ -39,8 +39,8 @@ import javax.annotation.concurrent.ThreadSafe; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxDownloadWorker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxDownloadWorker.java index 44afd8ce1..0298a2be9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxDownloadWorker.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxDownloadWorker.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.mailbox.MailboxFolderId; import org.briarproject.bramble.api.mailbox.MailboxProperties; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/SimpleApiCall.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/SimpleApiCall.java index 9a34a6244..1f80bd778 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/SimpleApiCall.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/SimpleApiCall.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.mailbox.MailboxApi.ApiException; import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitor.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitor.java index 5dd10b365..5e8d4ca97 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitor.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitor.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitorImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitorImpl.java index 8620aee01..359e70460 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitorImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/TorReachabilityMonitorImpl.java @@ -5,12 +5,12 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverter.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverter.java index 3be0eae4e..264d8e664 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverter.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverter.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; /** * An interface for converting an onion address to an HTTP URL, allowing the diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverterImpl.java index 2b293a1a3..0c1bc6daf 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/UrlConverterImpl.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.mailbox; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffFactoryImpl.java index 7640a9571..93767bc8d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffFactoryImpl.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffImpl.java index a4522cbb4..4cce8f046 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.atomic.AtomicInteger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java index ef03a78fd..64b53e003 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -30,6 +29,7 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java index 873a19e7a..97efc501c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; @@ -30,6 +29,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.api.system.Wakeful; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/AbstractBluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/AbstractBluetoothPlugin.java index 5d41a0bb6..374c10d4f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/AbstractBluetoothPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/AbstractBluetoothPlugin.java @@ -11,9 +11,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent; import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStoppedListeningEvent; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -26,6 +23,9 @@ import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.security.SecureRandom; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionFactory.java index 27689f979..6c296c3c6 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionFactory.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin.bluetooth; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiter.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiter.java index 23e2586cf..dce606cc4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiter.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiter.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin.bluetooth; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface BluetoothConnectionLimiter { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java index ac002a3cf..487676c68 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.bluetooth; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.sync.event.CloseSyncConnectionsEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.LinkedList; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java index 5ff607fb8..a1b1bb5d3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin.bluetooth; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/AbstractRemovableDrivePlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/AbstractRemovableDrivePlugin.java index ccdf7f56b..6c47737a7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/AbstractRemovableDrivePlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/AbstractRemovableDrivePlugin.java @@ -1,7 +1,6 @@ package org.briarproject.bramble.plugin.file; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportConnectionReader; @@ -9,6 +8,7 @@ import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java index 54587dc9c..d9da037c0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileInputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPlugin.java index a70e65708..6bd7bc7e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPlugin.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.plugin.file; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPluginFactory.java index 351368c84..bfd37ab1c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/MailboxPluginFactory.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveManagerImpl.java index c7a250d60..0f89bf2c9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveManagerImpl.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveManager; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.transport.KeyManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePlugin.java index d3464d725..8745d99cc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePlugin.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginFactory.java index a05b50715..0142d42e4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginFactory.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java index 5dc4b6762..743fcf03a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.plugin.file; import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactory.java index c6a126d81..ab2130a97 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactory.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.file; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface RemovableDriveTaskFactory { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java index 596f0b11e..8c798d22c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java @@ -5,10 +5,10 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskImpl.java index c17cc48ac..463cac5e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskImpl.java @@ -3,11 +3,11 @@ package org.briarproject.bramble.plugin.file; import org.briarproject.bramble.api.Consumer; import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; @@ -17,8 +17,8 @@ import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; import static java.lang.Math.min; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.plugin.file.RemovableDriveConstants.ID; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskRegistry.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskRegistry.java index ca29b473e..41180dba0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskRegistry.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskRegistry.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; +import org.briarproject.nullsafety.NotNullByDefault; @Deprecated // We can simply remove tasks when they finish @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java index e78fae50e..fdaba0dc4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java @@ -7,12 +7,12 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.event.MessagesSentEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportInputStreamReader.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportInputStreamReader.java index 8971136c9..29f54521a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportInputStreamReader.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportInputStreamReader.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportOutputStreamWriter.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportOutputStreamWriter.java index ec2f6240a..b7283f255 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportOutputStreamWriter.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/TransportOutputStreamWriter.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; import java.util.logging.Logger; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java index 6330a50cf..1354900a7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.net.Inet4Address; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginFactory.java index 80f4fa1d0..6fd413abc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginFactory.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.tcp; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -10,6 +9,7 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/MappingResult.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/MappingResult.java index aa9c271f5..5d2e8fe0d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/MappingResult.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/MappingResult.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.tcp; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java index 8b5adc876..f3ace3e2b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java @@ -3,8 +3,8 @@ package org.briarproject.bramble.plugin.tcp; import org.bitlet.weupnp.GatewayDevice; import org.bitlet.weupnp.GatewayDiscover; import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.xml.sax.SAXException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java index baa050255..eec362876 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java @@ -7,9 +7,6 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -20,6 +17,9 @@ import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.net.InetAddress; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpTransportConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpTransportConnection.java index 34c7d7a74..7951892f8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpTransportConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpTransportConnection.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.tcp; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection; import org.briarproject.bramble.util.IoUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java index 4dd061724..7ba4b7c32 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.plugin.tcp; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPluginFactory.java index 9468d6823..a607efa0e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPluginFactory.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.tcp; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -11,6 +10,7 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java index 7e1c4c83b..ef8cbb7cc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin.tor; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java index 8ad07f8d8..81e6eee02 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin.tor; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.util.ArrayList; @@ -16,12 +16,12 @@ import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static java.util.Arrays.asList; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @Immutable @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 792cf43d5..579c58eb5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -15,9 +15,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkStatus; import org.briarproject.bramble.api.network.event.NetworkStatusEvent; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -35,6 +32,9 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.ByteArrayInputStream; import java.io.EOFException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java index a22165151..f1efd8825 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -20,6 +19,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java index e6a1c5f26..bfbaf1a30 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.tor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection; import org.briarproject.bramble.util.IoUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java index cabf9f95d..7f17fed48 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java @@ -14,7 +14,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -29,6 +28,7 @@ import org.briarproject.bramble.api.sync.validation.IncomingMessageHook; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashMap; import java.util.Iterator; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyValidator.java b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyValidator.java index e74ca3f69..d0dd2b91b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyValidator.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyValidator.java @@ -7,10 +7,10 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/record/RecordReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/record/RecordReaderImpl.java index 70d909fb2..fb6abb151 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/record/RecordReaderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/record/RecordReaderImpl.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.record; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.Predicate; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordReader; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/record/RecordWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/record/RecordWriterImpl.java index 137af59dc..fc66f5272 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/record/RecordWriterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/record/RecordWriterImpl.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.record; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Ack.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Ack.java index 737e32fd5..a5694641f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Ack.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Ack.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Crc32.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Crc32.java index b4cf7bc25..fb5953e20 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Crc32.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Crc32.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class Crc32 { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Data.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Data.java index ab33b67cd..14ee04b01 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Data.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Data.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Frame.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Frame.java index 6e5d1969c..b4ff62507 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Frame.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Frame.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java index 9e0b37b50..88395a837 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.ReadHandler; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.Comparator; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReceiverInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReceiverInputStream.java index 6c0b838b9..d4fffb357 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReceiverInputStream.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReceiverInputStream.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerFactoryImpl.java index fbe4b1823..12f790415 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerFactoryImpl.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.reliability; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.ReliabilityLayer; import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory; import org.briarproject.bramble.api.reliability.WriteHandler; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.system.SystemClock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java index 0de0e491f..68c1594a0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.reliability.ReliabilityLayer; import org.briarproject.bramble.api.reliability.WriteHandler; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java index 982055eea..e9486e347 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.WriteHandler; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SenderOutputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SenderOutputStream.java index b90494b52..fcae8aab5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SenderOutputStream.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SenderOutputStream.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipDecoder.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipDecoder.java index b4ca04c94..da67a71c0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipDecoder.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipDecoder.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.ReadHandler; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipEncoder.java b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipEncoder.java index 1d7710845..0233f47bd 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipEncoder.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reliability/SlipEncoder.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.reliability; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.WriteHandler; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/KeyMaterialSourceImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/KeyMaterialSourceImpl.java index a7c9d42ec..f10ed22f4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/KeyMaterialSourceImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/KeyMaterialSourceImpl.java @@ -4,8 +4,8 @@ import org.bouncycastle.crypto.engines.Salsa20Engine; import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.ParametersWithIV; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java index 0fcd84417..c718e812b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.rendezvous; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface RendezvousCrypto { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java index c0cf89f94..a7e9cafc8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.rendezvous; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java index 54cc2ef08..b134280be 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java @@ -23,7 +23,6 @@ import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; @@ -44,6 +43,7 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; import org.briarproject.bramble.api.system.Wakeful; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; @@ -69,12 +69,12 @@ import static org.briarproject.bramble.api.contact.PendingContactState.ADDING_CO import static org.briarproject.bramble.api.contact.PendingContactState.FAILED; import static org.briarproject.bramble.api.contact.PendingContactState.OFFLINE; import static org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNull; import static org.briarproject.bramble.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS; import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS; import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNull; @NotNullByDefault class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReportServer.java b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReportServer.java index 127bbcc8f..213d45e1b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReportServer.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReportServer.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.reporting; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.IoUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.Closeable; import java.io.File; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java index e32f4757c..ab513d285 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TorConstants; import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.api.reporting.DevReporter; import org.briarproject.bramble.util.IoUtils; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileInputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java index e4e03989c..113fbc26c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java @@ -3,9 +3,9 @@ package org.briarproject.bramble.settings; import org.briarproject.bramble.api.db.DatabaseComponent; 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.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java index 42a466e1e..b6613ddbe 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.record.Record; @@ -31,6 +30,7 @@ import org.briarproject.bramble.api.sync.event.MessageToAckEvent; import org.briarproject.bramble.api.sync.event.MessageToRequestEvent; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/EagerSimplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/EagerSimplexOutgoingSession.java index 1cc62de9f..6e801f803 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/EagerSimplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/EagerSimplexOutgoingSession.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.SyncRecordWriter; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java index 0e34cf6b4..9e0a3d1cc 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java @@ -1,13 +1,13 @@ package org.briarproject.bramble.sync; import org.briarproject.bramble.api.crypto.CryptoComponent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.util.ByteUtils; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java index 6414b0490..1c4adea4b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java @@ -11,7 +11,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Ack; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.Offer; @@ -21,6 +20,7 @@ import org.briarproject.bramble.api.sync.Request; import org.briarproject.bramble.api.sync.SyncRecordReader; import org.briarproject.bramble.api.sync.SyncSession; import org.briarproject.bramble.api.sync.Versions; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.List; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/MailboxOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/MailboxOutgoingSession.java index afe7a72a8..48bfc519c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/MailboxOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/MailboxOutgoingSession.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.Ack; import org.briarproject.bramble.api.sync.Message; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.OutgoingSessionRecord; import org.briarproject.bramble.api.sync.SyncRecordWriter; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java index f979abab0..58f1e3b0e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java @@ -2,12 +2,12 @@ package org.briarproject.bramble.sync; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.crypto.CryptoComponent; -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.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java index a9efdcabe..c89bd5aec 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.record.Record; @@ -21,6 +20,7 @@ import org.briarproject.bramble.api.sync.SyncSession; import org.briarproject.bramble.api.sync.Versions; import org.briarproject.bramble.api.sync.event.CloseSyncConnectionsEvent; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderFactoryImpl.java index 7124f8810..358bd0ded 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderFactoryImpl.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.RecordReader; import org.briarproject.bramble.api.record.RecordReaderFactory; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.SyncRecordReader; import org.briarproject.bramble.api.sync.SyncRecordReaderFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java index 8d8857460..2329999ce 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.sync; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.Predicate; import org.briarproject.bramble.api.UniqueId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordReader; import org.briarproject.bramble.api.sync.Ack; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.sync.Request; import org.briarproject.bramble.api.sync.SyncRecordReader; import org.briarproject.bramble.api.sync.Versions; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterFactoryImpl.java index d83bda1a8..258df1253 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterFactoryImpl.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.api.record.RecordWriterFactory; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.SyncRecordWriter; import org.briarproject.bramble.api.sync.SyncRecordWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java index 38964b640..2079198b3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.api.sync.Ack; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.sync.Priority; import org.briarproject.bramble.api.sync.Request; import org.briarproject.bramble.api.sync.SyncRecordWriter; import org.briarproject.bramble.api.sync.Versions; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncSessionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncSessionFactoryImpl.java index fcd599af5..a503d5e77 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncSessionFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncSessionFactoryImpl.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.OutgoingSessionRecord; import org.briarproject.bramble.api.sync.Priority; @@ -17,6 +16,7 @@ import org.briarproject.bramble.api.sync.SyncSession; import org.briarproject.bramble.api.sync.SyncSessionFactory; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java index ac22c3593..a684ca9b7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java @@ -11,7 +11,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; @@ -25,6 +24,7 @@ import org.briarproject.bramble.api.sync.validation.MessageState; import org.briarproject.bramble.api.sync.validation.MessageValidator; import org.briarproject.bramble.api.sync.validation.ValidationManager; import org.briarproject.bramble.api.versioning.ClientMajorVersion; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.LinkedList; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java index 66b7df159..dd375abe7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.SecureRandomProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.DataOutputStream; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java index 363821537..186e64aa0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.system; import org.briarproject.bramble.api.Cancellable; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/system/UnixSecureRandomProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/system/UnixSecureRandomProvider.java index a992b955c..8254babe6 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/system/UnixSecureRandomProvider.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/system/UnixSecureRandomProvider.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.DataOutputStream; import java.io.File; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java index d1b014385..1b1764137 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java @@ -17,13 +17,13 @@ import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.PluginFactory; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.HashMap; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableIncomingKeys.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableIncomingKeys.java index 994013044..d33a96486 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableIncomingKeys.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableIncomingKeys.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.IncomingKeys; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableOutgoingKeys.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableOutgoingKeys.java index 44ba3a3ea..a99a7ffd9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableOutgoingKeys.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableOutgoingKeys.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.OutgoingKeys; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeySet.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeySet.java index 55480107b..8f0eaf1c2 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeySet.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeySet.java @@ -2,13 +2,13 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.KeySetId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull; +import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull; @NotThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java index 192c76415..d6ccff483 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/ReorderingWindow.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/ReorderingWindow.java index 4b0ea2bc6..3f404a16c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/ReorderingWindow.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/ReorderingWindow.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collections; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java index 2b8596047..7908f1b3a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamDecrypterFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderImpl.java index 770592c73..5fc0c0f48 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderImpl.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.StreamDecrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java index 38262fc99..5af24f1a4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java @@ -2,10 +2,10 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.StreamEncrypterFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java index 2a2279e35..0b4e3be8f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.StreamEncrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.transport.StreamWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java index 0448e8bc7..a5a48f8e7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.crypto.SecretKey; 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.transport.KeySetId; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactory.java index 64907dc41..c761cdb37 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactory.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface TransportKeyManagerFactory { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java index 5799ca7ea..44fc6f6ff 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java @@ -3,10 +3,10 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.TransportCrypto; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java index 769be9c39..788d51d3c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseExecutor; 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.plugin.TransportId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; @@ -19,6 +18,7 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.TransportKeySet; import org.briarproject.bramble.api.transport.TransportKeys; import org.briarproject.bramble.transport.ReorderingWindow.Change; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; @@ -37,12 +37,12 @@ import javax.annotation.concurrent.ThreadSafe; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull; import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE; import static org.briarproject.bramble.api.transport.TransportConstants.PROTOCOL_VERSION; import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH; import static org.briarproject.bramble.util.ByteUtils.MAX_32_BIT_UNSIGNED; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull; @ThreadSafe @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoder.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoder.java index 058fc894d..9d2eec898 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoder.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoder.java @@ -2,11 +2,11 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; 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; @NotNullByDefault interface MessageEncoder { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoderImpl.java index 35d019a79..ae3d1b53d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageEncoderImpl.java @@ -6,12 +6,12 @@ import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageType.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageType.java index 1e63464e3..035c6e4c3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageType.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/MessageType.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/Session.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/Session.java index f431bdfd1..4a19c46e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/Session.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/Session.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.crypto.KeyPair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.transport.KeySetId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoder.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoder.java index 949ed977b..2266c7168 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoder.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoder.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionEncoder { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoderImpl.java index 8b79f45fa..3909ab4fb 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoderImpl.java @@ -3,9 +3,9 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.KeySetId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParser.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParser.java index 7b9e2a3e8..e719ee8e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParser.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParser.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionParser { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParserImpl.java index 14ba99fb8..a0d18f380 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParserImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParserImpl.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.transport.KeySetId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/State.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/State.java index 9ab3f97da..294631fe1 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/State.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/State.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport.agreement; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementConstants.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementConstants.java index ae2fd4474..7bb9c2caa 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementConstants.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementConstants.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.transport.agreement; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface TransportKeyAgreementConstants { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java index 888e33d6e..bb04bdb06 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java index 5fed461e1..cbf458877 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java index 8fab1c8b2..82a17af1e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java @@ -20,7 +20,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.PluginFactory; import org.briarproject.bramble.api.plugin.TransportId; @@ -34,6 +33,7 @@ import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.bramble.api.transport.agreement.TransportKeyAgreementManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; @@ -51,7 +51,6 @@ import static java.util.Collections.singletonMap; import static java.util.logging.Level.INFO; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.Bytes.compare; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.sync.validation.IncomingMessageHook.DeliveryAction.ACCEPT_DO_NOT_SHARE; import static org.briarproject.bramble.api.sync.validation.IncomingMessageHook.DeliveryAction.DEFER; import static org.briarproject.bramble.api.sync.validation.IncomingMessageHook.DeliveryAction.REJECT; @@ -63,6 +62,7 @@ import static org.briarproject.bramble.transport.agreement.State.AWAIT_KEY; import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.MSG_KEY_MESSAGE_TYPE; import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.MSG_KEY_PUBLIC_KEY; import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.MSG_KEY_TRANSPORT_ID; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @Immutable @NotNullByDefault diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementValidator.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementValidator.java index c371fca77..ca43a94c4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementValidator.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementValidator.java @@ -7,12 +7,12 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java index fdaa6a80f..72d551561 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java @@ -15,7 +15,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; @@ -29,6 +28,7 @@ import org.briarproject.bramble.api.versioning.ClientMajorVersion; import org.briarproject.bramble.api.versioning.ClientVersion; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.event.ClientVersionUpdatedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningValidator.java b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningValidator.java index e2fc20913..b6fbb0c5d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningValidator.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningValidator.java @@ -7,10 +7,10 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java b/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java index 4c0bf1418..a6b93c6cc 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java @@ -6,12 +6,12 @@ import org.briarproject.bramble.api.client.BdfMessageValidator; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageContext; import org.briarproject.bramble.test.ValidatorTestCase; +import org.briarproject.nullsafety.NotNullByDefault; import org.jmock.Expectations; import org.jmock.imposters.ByteBuddyClassImposteriser; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTest.java index c664eb3d0..11e8a63c8 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTest.java @@ -15,10 +15,10 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.bramble.test.TestDuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PseudoRandom.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PseudoRandom.java index ccb80a42f..235aa94a5 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PseudoRandom.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PseudoRandom.java @@ -5,7 +5,7 @@ import org.bouncycastle.crypto.digests.Blake2bDigest; import org.bouncycastle.crypto.engines.Salsa20Engine; import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.ParametersWithIV; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/TestAuthenticatedCipher.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/TestAuthenticatedCipher.java index dd7982795..334f7cc84 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/TestAuthenticatedCipher.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/TestAuthenticatedCipher.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseMigrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseMigrationTest.java index a752d072a..14dd92530 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseMigrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseMigrationTest.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.db.DataTooNewException; import org.briarproject.bramble.api.db.DataTooOldException; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.system.Clock; @@ -14,6 +13,7 @@ import org.briarproject.bramble.test.BrambleMockTestCase; import org.briarproject.bramble.test.TestDatabaseConfig; import org.briarproject.bramble.test.TestMessageFactory; import org.briarproject.bramble.test.TestUtils; +import org.briarproject.nullsafety.NotNullByDefault; import org.jmock.Expectations; import org.junit.After; import org.junit.Before; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2MigrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2MigrationTest.java index 4646a05b4..808bbc825 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2MigrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2MigrationTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.sql.Connection; import java.util.List; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java index 641f20805..276dcdc4f 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java @@ -2,9 +2,9 @@ package org.briarproject.bramble.db; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Ignore; import java.sql.Connection; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java index 66ffeea02..8d99bee2f 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Before; import java.sql.Connection; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxClientTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxClientTest.java index c0c7986f2..ca4bc5b6a 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxClientTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxClientTest.java @@ -8,9 +8,9 @@ import org.jmock.Expectations; import org.junit.Test; import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.test.TestUtils.getContactId; import static org.briarproject.bramble.test.TestUtils.getMailboxProperties; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; public class ContactMailboxClientTest extends BrambleMockTestCase { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxClientManagerTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxClientManagerTest.java index c658a6d76..2115a5501 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxClientManagerTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxClientManagerTest.java @@ -36,12 +36,12 @@ import javax.annotation.Nullable; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; import static org.briarproject.bramble.api.plugin.Plugin.State.ENABLING; import static org.briarproject.bramble.api.plugin.TorConstants.ID; import static org.briarproject.bramble.test.TestUtils.getContact; import static org.briarproject.bramble.test.TestUtils.getMailboxProperties; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; public class MailboxClientManagerTest extends BrambleMockTestCase { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerTest.java index 12232122e..1297fcf81 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerTest.java @@ -30,9 +30,9 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.test.TestUtils.getContact; import static org.briarproject.bramble.test.TestUtils.getMailboxProperties; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTest.java index b924beb5f..59e0b67f6 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTest.java @@ -9,12 +9,12 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.TestDatabaseConfigModule; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestModule.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestModule.java index 5f3e19842..77d2dea0f 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestModule.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java index 6b2cd7101..6f6881599 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java @@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.tcp; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Test; import java.io.IOException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/system/TestTaskScheduler.java b/bramble-core/src/test/java/org/briarproject/bramble/system/TestTaskScheduler.java index 541ba57a9..6e9f45328 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/system/TestTaskScheduler.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/system/TestTaskScheduler.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.system; import org.briarproject.bramble.api.Cancellable; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.TaskScheduler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Queue; import java.util.concurrent.CountDownLatch; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTest.java index 68e9fe39b..e4cd51826 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTest.java @@ -11,13 +11,13 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; import org.briarproject.bramble.api.sync.event.MessagesAckedEvent; import org.briarproject.bramble.api.sync.event.MessagesSentEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.junit.After; import org.junit.Before; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/CollectionMatcher.java b/bramble-core/src/test/java/org/briarproject/bramble/test/CollectionMatcher.java index 365878217..da8183461 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/CollectionMatcher.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/CollectionMatcher.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java b/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java index 7d488ecc7..3e7427079 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/PairMatcher.java b/bramble-core/src/test/java/org/briarproject/bramble/test/PairMatcher.java index 5e834fb5e..f000cc1ad 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/PairMatcher.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/PairMatcher.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.test; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java index ed4afd622..16bf35271 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java @@ -2,7 +2,7 @@ package org.briarproject.bramble.test; import org.briarproject.bramble.api.crypto.KeyStrengthener; import org.briarproject.bramble.api.db.DatabaseConfig; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDuplexTransportConnection.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDuplexTransportConnection.java index 83ec8129e..5e30614c4 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDuplexTransportConnection.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDuplexTransportConnection.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestMessageFactory.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestMessageFactory.java index 6a7f09095..c4a33299a 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestMessageFactory.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestMessageFactory.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.test; -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.MessageFactory; +import org.briarproject.nullsafety.NotNullByDefault; import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java index efab0271e..27fc9c8d3 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.TransportId; @@ -8,6 +7,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestSecureRandomProvider.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSecureRandomProvider.java index c34c227d1..112a764b7 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestSecureRandomProvider.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSecureRandomProvider.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.SecureRandomProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.Provider; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionReader.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionReader.java index 866813b8d..94a1a2256 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionReader.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionReader.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionWriter.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionWriter.java index 9c9cc48fd..178ef5d80 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionWriter.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestTransportConnectionWriter.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.test; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamDecrypter.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamDecrypter.java index 2823539d0..eaa4cbf73 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamDecrypter.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamDecrypter.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.StreamDecrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamEncrypter.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamEncrypter.java index 4ff790b94..2790cce64 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamEncrypter.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/TestStreamEncrypter.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.transport; import org.briarproject.bramble.api.crypto.StreamEncrypter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.ByteUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.OutputStream; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java index 094754ddf..d9892eaaf 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java @@ -14,7 +14,7 @@ import com.sun.jna.win32.StdCallLibrary.StdCallCallback; import com.sun.jna.win32.W32APIFunctionMapper; import com.sun.jna.win32.W32APITypeMapper; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collections; import java.util.HashMap; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java index 72ccbab2f..a4df22b33 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java @@ -2,8 +2,8 @@ package org.briarproject.bramble.network; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkStatus; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothConnectionFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothConnectionFactory.java index 50f1514f2..53a3f874f 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothConnectionFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothConnectionFactory.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.bluetooth; import org.briarproject.bramble.api.io.TimeoutMonitor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java index 4a4e2e639..8c28f2503 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.plugin.bluetooth; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.security.SecureRandom; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java index d7dbcfd11..df1b6cffe 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.bluetooth; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.io.TimeoutMonitor; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -11,6 +10,7 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java index 4e2d20562..ff5784d5b 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.bluetooth; import org.briarproject.bramble.api.io.TimeoutMonitor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java index a25acbad5..d558da06c 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java index 81866a9ac..38e9a3164 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface ModemFactory { diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java index 78b8eff8b..9f004b899 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.system.SystemClock; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java index 3bf2867cf..2a145cc31 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.reliability.ReliabilityLayer; import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory; import org.briarproject.bramble.api.reliability.WriteHandler; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java index f93854f3e..f920bd643 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java @@ -3,9 +3,6 @@ package org.briarproject.bramble.plugin.modem; import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; @@ -16,6 +13,9 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java index 459e9385a..d0e675f2c 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java @@ -1,13 +1,13 @@ package org.briarproject.bramble.plugin.modem; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java index b21100c7d..706f268f3 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java index f3e1aff06..2e9265685 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java index 918bcd6f3..911bbbc3b 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SerialPortList { diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java index b2375d0d4..63a09f285 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class SerialPortListImpl implements SerialPortList { diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java index dcc0c9f00..5dd647ead 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java @@ -2,12 +2,12 @@ package org.briarproject.bramble.plugin.tor; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.net.URI; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java index c68dc0130..90de04434 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java @@ -5,12 +5,12 @@ import com.sun.jna.Native; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java index c31bd8e57..cc8e29438 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java index 9f49416fe..9bd16bd97 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java @@ -4,13 +4,13 @@ import com.sun.jna.platform.win32.Kernel32; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.Scanner; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java index 9496a9689..81302a01b 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java index e9aadd8d3..a25f9c8b9 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.LocationUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; import java.util.logging.Logger; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java index faf5068b4..a462f0afb 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java @@ -1,13 +1,13 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import javax.inject.Inject; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @NotNullByDefault class JavaResourceProvider implements ResourceProvider { diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index 54575469c..1a92ed970 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorSocksPort; @@ -21,6 +20,7 @@ import org.briarproject.bramble.test.BrambleJavaIntegrationTestComponent; import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.DaggerBrambleJavaIntegrationTestComponent; import org.briarproject.bramble.util.OsUtils; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/TestPluginCallback.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/TestPluginCallback.java index b25038bc8..cb4cf7494 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/TestPluginCallback.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/TestPluginCallback.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.plugin.tor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TransportConnectionReader; @@ -8,6 +7,7 @@ import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/ScreenshotOnFailureRule.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/ScreenshotOnFailureRule.java index 87b8b7833..bd2d2941c 100644 --- a/briar-android/src/androidTest/java/org/briarproject/briar/android/ScreenshotOnFailureRule.java +++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/ScreenshotOnFailureRule.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java index 5c78c3043..675c5f2c0 100644 --- a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java +++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java @@ -5,9 +5,9 @@ import android.content.Intent; import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.ClassRule; import javax.inject.Inject; diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageCompressorTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageCompressorTest.java index 67f6b902d..b2b3cf422 100644 --- a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageCompressorTest.java +++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageCompressorTest.java @@ -13,8 +13,8 @@ import java.util.logging.Logger; import androidx.test.filters.LargeTest; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageSizeCalculatorTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageSizeCalculatorTest.java index 9d2054aa1..5cef394ee 100644 --- a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageSizeCalculatorTest.java +++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageSizeCalculatorTest.java @@ -15,8 +15,8 @@ import java.util.logging.Logger; import androidx.test.filters.LargeTest; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; import static org.junit.Assume.assumeTrue; @LargeTest diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidDatabaseConfig.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidDatabaseConfig.java index e13b1463a..2668a3f07 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidDatabaseConfig.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidDatabaseConfig.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android; import org.briarproject.bramble.api.crypto.KeyStrengthener; import org.briarproject.bramble.api.db.DatabaseConfig; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java index f0c7d6a26..c10a4050b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java @@ -4,7 +4,7 @@ import android.security.keystore.KeyGenParameterSpec; import org.briarproject.bramble.api.crypto.KeyStrengthener; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java index 130b9cb9e..64b53bc93 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java @@ -21,8 +21,6 @@ import org.briarproject.bramble.api.lifecycle.ServiceException; import org.briarproject.bramble.api.mailbox.MailboxStatus; import org.briarproject.bramble.api.mailbox.event.MailboxProblemEvent; import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; @@ -46,6 +44,8 @@ import org.briarproject.briar.api.conversation.ConversationResponse; import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent; import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent; import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Set; import java.util.concurrent.Callable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java index 7fedfe6d1..d58039215 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java @@ -16,7 +16,6 @@ import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.mailbox.MailboxDirectory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.PluginConfig; @@ -63,6 +62,7 @@ import org.briarproject.briar.api.android.LockManager; import org.briarproject.briar.api.android.NetworkUsageMetrics; import org.briarproject.briar.api.android.ScreenFilterMonitor; import org.briarproject.briar.api.test.TestAvatarCreator; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.security.GeneralSecurityException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java index 58e9adf68..563b35947 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java @@ -50,7 +50,6 @@ import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult.ALREADY_RUNNING; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult.SUCCESS; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.AndroidUtils.isUiThread; import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY; import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID; @@ -59,6 +58,7 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGO import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID; import static org.briarproject.briar.api.android.LockManager.ACTION_LOCK; import static org.briarproject.briar.api.android.LockManager.EXTRA_PID; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; public class BriarService extends Service { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/LevelRaisingHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/LevelRaisingHandler.java index 6f7ba6705..ea775151a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/LevelRaisingHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/LevelRaisingHandler.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Handler; import java.util.logging.Level; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java b/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java index 015a96d98..2909362eb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.content.res.Resources; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/NetworkUsageMetricsImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/NetworkUsageMetricsImpl.java index b1675ecff..77e86d804 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/NetworkUsageMetricsImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/NetworkUsageMetricsImpl.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android; import android.net.TrafficStats; import android.os.Process; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.android.NetworkUsageMetrics; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java index f751b46d6..879d16471 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java @@ -9,12 +9,12 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java index 0cb51987a..be7ea75bb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java @@ -13,10 +13,10 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.api.android.ScreenFilterMonitor; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java index 6cfdc2565..82fc8b409 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java @@ -3,13 +3,13 @@ package org.briarproject.briar.android; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.fragment.ErrorFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java index f14bba7fe..5997e656b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java @@ -10,9 +10,9 @@ import android.widget.Button; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java index cec359705..1c22e8187 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java @@ -9,10 +9,10 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ProgressBar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java index 0d59345c7..8f86e9b5e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java @@ -4,8 +4,8 @@ package org.briarproject.briar.android.account; import android.content.Context; import android.util.AttributeSet; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiAppLaunchView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiAppLaunchView.java index aeb3522a8..216dd1b82 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiAppLaunchView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiAppLaunchView.java @@ -6,8 +6,8 @@ import android.content.Intent; import android.util.AttributeSet; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiProtectedAppsView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiProtectedAppsView.java index 42ebd141b..ec4b442b8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiProtectedAppsView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiProtectedAppsView.java @@ -4,8 +4,8 @@ package org.briarproject.briar.android.account; import android.content.Context; import android.util.AttributeSet; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java index e2e396958..5ace463a3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java @@ -11,8 +11,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; @@ -20,6 +18,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.BriarService; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.android.LockManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java index 6cf3401e3..27563b3ba 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java @@ -11,8 +11,8 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java index 59c9b07a9..3d2c2d34a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java @@ -12,10 +12,10 @@ import android.widget.ProgressBar; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.login.StrengthMeter; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java index 076cd4a10..55d04c238 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java @@ -4,12 +4,12 @@ import android.annotation.TargetApi; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java index 017846064..788ecf0e9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java @@ -10,11 +10,11 @@ import android.view.View.OnClickListener; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java index 0c1243e29..6caf70a5f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java @@ -6,10 +6,10 @@ import org.briarproject.android.dontkillmelib.DozeHelper; import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java index 052864d2c..6db9133d9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java @@ -10,12 +10,12 @@ import android.os.Bundle; import android.os.CancellationSignal; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.api.android.LockManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiLockAppsView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiLockAppsView.java index 84cfd1cd9..d2af11a90 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiLockAppsView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiLockAppsView.java @@ -4,8 +4,8 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiRecentAppsView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiRecentAppsView.java index 0efef138f..05dac77d4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiRecentAppsView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/XiaomiRecentAppsView.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.account; import android.content.Context; import android.util.AttributeSet; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index 30c518dbc..77ade1893 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -6,8 +6,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.AndroidComponent; import org.briarproject.briar.android.BriarApplication; @@ -21,6 +19,8 @@ import org.briarproject.briar.android.widget.TapSafeFrameLayout; import org.briarproject.briar.android.widget.TapSafeFrameLayout.OnTapFilteredListener; import org.briarproject.briar.api.android.ScreenFilterMonitor; import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java index a2b8900f3..8c72093ba 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java @@ -5,8 +5,6 @@ import android.transition.Transition; import android.view.Window; import android.widget.CheckBox; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLockManager; import org.briarproject.bramble.api.system.Wakeful; import org.briarproject.briar.R; @@ -18,6 +16,8 @@ import org.briarproject.briar.android.controller.handler.UiResultHandler; import org.briarproject.briar.android.login.StartupActivity; import org.briarproject.briar.android.logout.ExitActivity; import org.briarproject.briar.api.android.LockManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java index f2451de10..e85c24048 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java @@ -5,11 +5,11 @@ import android.net.Uri; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.attachment.media.ImageCompressor; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java index 1d8395081..8a937b8ec 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java @@ -3,10 +3,10 @@ package org.briarproject.briar.android.attachment; import android.net.Uri; import org.briarproject.bramble.api.lifecycle.IoExecutor; -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.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java index 348300a09..e01d84ee5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java @@ -6,7 +6,6 @@ import android.net.Uri; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; -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.R; @@ -15,6 +14,7 @@ import org.briarproject.briar.api.attachment.Attachment; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.FileTooBigException; import org.briarproject.briar.api.messaging.MessagingManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.util.ArrayList; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java index 36e83644a..041750b22 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.attachment; import android.content.res.Resources; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java index 46abaf78e..58c95c67e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java @@ -3,10 +3,10 @@ package org.briarproject.briar.android.attachment; import android.os.Parcel; import android.os.Parcelable; -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.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItemResult.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItemResult.java index 1254a851d..0612d4cc8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItemResult.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItemResult.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.attachment; import android.net.Uri; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java index 07f48d44a..cc15637b0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.attachment; import android.net.Uri; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentResult.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentResult.java index 776d2ab59..a73e49e19 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentResult.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentResult.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.attachment; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java index 3df13d61e..0d226220f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java @@ -2,12 +2,12 @@ package org.briarproject.briar.android.attachment; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.attachment.Attachment; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java index eeb1e37a0..7d38ca8ff 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java @@ -3,7 +3,6 @@ package org.briarproject.briar.android.attachment; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchMessageException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.android.attachment.AttachmentItem.State; import org.briarproject.briar.android.attachment.media.ImageHelper; @@ -13,6 +12,7 @@ import org.briarproject.briar.api.attachment.Attachment; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.AttachmentReader; import org.briarproject.briar.api.messaging.PrivateMessageHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.BufferedInputStream; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelper.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelper.java index b8ef6d4b0..2bc492eab 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelper.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelper.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.attachment.media; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java index 97a596674..e283c57aa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java @@ -3,7 +3,7 @@ package org.briarproject.briar.android.attachment.media; import android.graphics.BitmapFactory; import android.webkit.MimeTypeMap; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculator.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculator.java index 52d34791d..494a458a3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculator.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculator.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.attachment.media; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java index d0e6d6dae..c3d50cf2f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.attachment.media; import com.bumptech.glide.util.MarkEnforcingInputStream; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.media.ImageHelper.DecodeResult; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/Size.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/Size.java index 90413c138..81eeb4400 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/Size.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/media/Size.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.attachment.media; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseViewModel.java index 1dd159ea1..e4360d81c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseViewModel.java @@ -11,7 +11,6 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.AndroidExecutor; @@ -23,6 +22,7 @@ import org.briarproject.briar.api.blog.BlogCommentHeader; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPostHeader; import org.briarproject.briar.util.HtmlUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collections; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java index ae8da2f67..f7cc8452b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java @@ -3,8 +3,6 @@ package org.briarproject.briar.android.blog; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; @@ -13,6 +11,8 @@ import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.sharing.BlogSharingStatusActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java index 451790de0..d77e847e8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java @@ -10,8 +10,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -22,6 +20,8 @@ import org.briarproject.briar.android.sharing.ShareBlogActivity; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.widget.LinkDialogFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java index 484a6b13e..6880c9849 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java @@ -4,9 +4,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java index b7790571e..a4ddc0bcd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java @@ -9,14 +9,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.widget.LinkDialogFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java index 85457f16f..46067a496 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java @@ -9,12 +9,12 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.view.AuthorView; import org.briarproject.briar.api.blog.BlogCommentHeader; import org.briarproject.briar.api.blog.BlogPostHeader; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; import androidx.core.view.ViewCompat; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogViewModel.java index f601d6e1b..fe694493f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogViewModel.java @@ -12,8 +12,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.bramble.api.system.AndroidExecutor; @@ -27,6 +25,8 @@ import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent; import org.briarproject.briar.api.blog.event.BlogPostAddedEvent; import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java index 9c57be9ad..85f8c7974 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java @@ -9,8 +9,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -20,6 +18,8 @@ import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.briar.api.blog.Blog; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedViewModel.java index a14f4b4d4..7ec147a2e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedViewModel.java @@ -11,7 +11,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.bramble.api.system.AndroidExecutor; @@ -20,6 +19,7 @@ import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.event.BlogPostAddedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collections; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index 72beffa1a..240dd5b79 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java @@ -7,8 +7,6 @@ import android.view.ViewGroup; import android.widget.ProgressBar; import android.widget.ScrollView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; @@ -20,6 +18,8 @@ import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.android.view.TextSendController.SendState; import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedActivity.java index 15c64e128..e64af07d6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedActivity.java @@ -3,12 +3,12 @@ package org.briarproject.briar.android.blog; import android.os.Bundle; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java index ecf373058..4ef04ffe0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java @@ -7,9 +7,9 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.api.feed.Feed; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedDeleteFeedDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedDeleteFeedDialogFragment.java index 8fa06e113..611ac6f55 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedDeleteFeedDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedDeleteFeedDialogFragment.java @@ -4,11 +4,11 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BaseActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFailedDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFailedDialogFragment.java index 1ba7cc14b..a8f44f3d0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFailedDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFailedDialogFragment.java @@ -4,10 +4,10 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BaseActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFragment.java index 96845f9bc..f4a9f5b93 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportFragment.java @@ -10,11 +10,11 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageFragment.java index fb3866128..d8ce1c751 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageFragment.java @@ -9,13 +9,13 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.api.feed.Feed; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; @@ -24,9 +24,9 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.blog.RssFeedAdapter.RssFeedListener; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedViewModel.java index e992dbd7a..785d34c46 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedViewModel.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.viewmodel.DbViewModel; @@ -18,6 +17,7 @@ import org.briarproject.briar.android.viewmodel.LiveResult; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.feed.Feed; import org.briarproject.briar.api.feed.FeedManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.net.MalformedURLException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index 070eb6661..4c4b36d33 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -9,8 +9,6 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -23,6 +21,8 @@ import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.security.GeneralSecurityException; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java index 803eb5d73..91d86d2d6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.contact; import org.briarproject.bramble.api.contact.Contact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java index 300ef37bd..6efb35691 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java @@ -5,10 +5,10 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.TrustIndicatorView; import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java index e6d38054b..4b4ec0b49 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java @@ -4,9 +4,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NullSafety; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NullSafety; import androidx.recyclerview.widget.DiffUtil.ItemCallback; import androidx.recyclerview.widget.ListAdapter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java index 4f586eb6e..7ee423ab0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java @@ -11,8 +11,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity; @@ -22,6 +20,8 @@ import org.briarproject.briar.android.conversation.ConversationActivity; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java index e917625da..07e5c7884 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java @@ -1,11 +1,10 @@ package org.briarproject.briar.android.contact; import org.briarproject.bramble.api.contact.Contact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.client.MessageTracker.GroupCount; -import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java index 149a26972..fde8e8aa1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.contact; import android.view.View; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListViewModel.java index 9fa4c3cc7..c15d45e51 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListViewModel.java @@ -12,11 +12,11 @@ import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactsViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactsViewModel.java index 266b4c26c..cf50a0871 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactsViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactsViewModel.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.system.AndroidExecutor; @@ -26,11 +25,10 @@ import org.briarproject.briar.android.viewmodel.LiveResult; import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent; import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.conversation.ConversationManager; -import org.briarproject.briar.api.conversation.ConversationMessageHeader; -import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent; import org.briarproject.briar.api.conversation.event.ConversationMessageTrackedEvent; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collections; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java index 18a40b22e..d58524e30 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java @@ -6,8 +6,6 @@ import android.view.MenuItem; import android.widget.Toast; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; @@ -18,6 +16,8 @@ import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewMod import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.util.ActivityLaunchers.RequestBluetoothDiscoverable; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java index 9944f3663..34f985a1f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java @@ -8,12 +8,12 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.util.UiUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java index 09ba81b32..81b386d01 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java @@ -10,8 +10,6 @@ import android.widget.LinearLayout.LayoutParams; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeStarted; @@ -23,6 +21,8 @@ import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.qrcode.CameraException; import org.briarproject.briar.android.qrcode.CameraView; import org.briarproject.briar.android.view.QrCodeView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java index e89d691ec..7136b497e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java @@ -6,11 +6,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ScrollView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java index 4eca97b9a..f5c543145 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java @@ -34,7 +34,6 @@ import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEven import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStartedEvent; import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.Plugin; @@ -57,6 +56,7 @@ import org.briarproject.briar.android.qrcode.QrCodeDecoder; import org.briarproject.briar.android.qrcode.QrCodeUtils; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.nio.charset.Charset; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java index f97ed0863..b7784285c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java @@ -5,12 +5,12 @@ import android.os.Bundle; import android.view.MenuItem; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java index a57c4e35e..d3343b57c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java @@ -11,12 +11,12 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchPendingContactException; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.LiveResult; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java index e83134873..38f46b4f4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java @@ -16,11 +16,11 @@ import android.widget.Toast; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.regex.Matcher; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java index 00012a58e..f273af285 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java @@ -20,11 +20,11 @@ import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.db.ContactExistsException; import org.briarproject.bramble.api.db.PendingContactExistsException; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactItem.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactItem.java index ec6d5a0f6..2fa28c77a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactItem.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.contact.add.remote; import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.contact.PendingContactState; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java index 359f79396..2918935b9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java @@ -7,13 +7,13 @@ import android.view.MenuItem; import com.google.android.material.snackbar.Snackbar; import org.briarproject.bramble.api.contact.PendingContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListAdapter.java index 1aa31a0a8..237eb8d96 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListAdapter.java @@ -6,9 +6,9 @@ import android.view.View; import android.view.ViewGroup; import org.briarproject.bramble.api.contact.PendingContact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.util.BriarAdapter; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class PendingContactListAdapter extends diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java index dfcc37999..34c1cd14f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java @@ -16,11 +16,11 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.rendezvous.RendezvousPoller; import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.viewmodel.DbViewModel; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java index 85dbc52b7..886e3ba3f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java @@ -4,9 +4,9 @@ import android.view.View; import android.widget.TextView; import org.briarproject.bramble.api.contact.PendingContact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.TextAvatarView; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.appcompat.widget.AppCompatImageButton; import androidx.core.content.ContextCompat; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java index 52d02c0f4..ed774bcd2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java @@ -9,10 +9,10 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.util.ActivityLaunchers.RequestBluetoothDiscoverable; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java index fee273f58..6dd9b4664 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java index de8413514..3f3f46df1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java @@ -6,11 +6,11 @@ import android.view.MenuItem; import android.widget.Toast; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java index d73d2db34..3a1cf0f75 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java @@ -14,7 +14,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; @@ -27,6 +26,7 @@ import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothState.S import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorAdapter.java index 6f9f7ddca..94319ec34 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorAdapter.java @@ -3,10 +3,10 @@ package org.briarproject.briar.android.contactselection; import android.content.Context; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.contact.BaseContactListAdapter; import org.briarproject.briar.android.contact.ContactItemViewHolder; import org.briarproject.briar.android.contact.OnContactClickListener; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java index 5d5ce1df3..858e0154a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java @@ -8,8 +8,6 @@ import android.view.ViewGroup; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.ContactItemViewHolder; @@ -17,6 +15,8 @@ import org.briarproject.briar.android.contact.OnContactClickListener; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java index 1e4388c26..57cc644ef 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java @@ -4,10 +4,10 @@ import android.view.View; import android.widget.CheckBox; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.ContactItemViewHolder; import org.briarproject.briar.android.contact.OnContactClickListener; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java index 8f9002f59..5eecdfd97 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java @@ -3,12 +3,12 @@ package org.briarproject.briar.android.contactselection; import android.os.Bundle; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorAdapter.java index 97c45b5c5..e67cdd199 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorAdapter.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.OnContactClickListener; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class ContactSelectorAdapter extends diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorController.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorController.java index 778a03853..a472995b7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorController.java @@ -2,10 +2,10 @@ package org.briarproject.briar.android.contactselection; 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.GroupId; import org.briarproject.briar.android.controller.DbController; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorControllerImpl.java index da25fbda3..054ac6cd5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorControllerImpl.java @@ -6,12 +6,12 @@ import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.controller.DbControllerImpl; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java index 634d855fe..1475eeba5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java @@ -5,10 +5,10 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.OnContactClickListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java index b9dc45d2a..dfcf1858f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.contactselection; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java index 5ec6c782c..cc3902393 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.contactselection; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.contact.OnContactClickListener; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactItem.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactItem.java index a3d09f8ce..29f4aa809 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactItem.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.contactselection; import org.briarproject.bramble.api.contact.Contact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.contact.ContactItem; import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarController.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarController.java index 33cbb9e64..476380460 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarController.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.controller; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Wakeful; import org.briarproject.briar.android.controller.handler.ResultHandler; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface BriarController extends ActivityLifecycleController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java index c544e1c9d..47dfa1ba8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidWakeLockManager; @@ -17,6 +16,7 @@ import org.briarproject.briar.android.BriarService; import org.briarproject.briar.android.BriarService.BriarServiceConnection; import org.briarproject.briar.android.controller.handler.ResultHandler; import org.briarproject.briar.api.android.DozeWatchdog; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/DbController.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/DbController.java index 8e2078597..e4d4810c3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/DbController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/DbController.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.controller; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @Deprecated @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/DbControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/DbControllerImpl.java index b77ad0995..ea92e918e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/DbControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/DbControllerImpl.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.controller; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java index abf7d2712..f7f43afa0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.controller.handler; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.DestroyableContext; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java index d2cd5c04f..96c92c64b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.controller.handler; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.DestroyableContext; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java index fddc8d98a..fd74cc522 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java @@ -11,11 +11,11 @@ import android.widget.EditText; import com.google.android.material.textfield.TextInputLayout; import org.briarproject.bramble.api.contact.Contact; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 1695970ab..22f8fa178 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -34,8 +34,6 @@ import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.sync.ClientId; @@ -86,6 +84,8 @@ import org.briarproject.briar.api.introduction.IntroductionManager; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java index 36a2c5fa4..3b2409c5b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java @@ -7,11 +7,11 @@ import android.view.View; import android.view.ViewGroup; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.util.BriarAdapter; import org.briarproject.briar.android.util.ItemReturningAdapter; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java index c3d96e462..437a2b1ed 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.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.conversation.ConversationMessageHeader; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemDetailsLookup.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemDetailsLookup.java index 021c769c2..06c7568cb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemDetailsLookup.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemDetailsLookup.java @@ -3,7 +3,7 @@ package org.briarproject.briar.android.conversation; import android.view.MotionEvent; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.recyclerview.selection.ItemDetailsLookup; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemKeyProvider.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemKeyProvider.java index 8e611400c..c0c2ad5e3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemKeyProvider.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemKeyProvider.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.conversation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.recyclerview.selection.ItemKeyProvider; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java index c09a2cbf7..42fdd03c3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java @@ -5,8 +5,8 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.CallSuper; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java index 65a25e343..ad392705e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.conversation; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java index b9185c1ce..2f3dcd960 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.conversation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.api.messaging.PrivateMessageHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java index 5baed8f1c..529fcf3e8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java @@ -4,9 +4,9 @@ import android.content.res.ColorStateList; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItem; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; import androidx.constraintlayout.widget.ConstraintSet; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java index 50400017a..f830daa21 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.conversation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationResponse; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java index 2244b7ca8..2109b5f57 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.conversation; import android.view.View; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.CallSuper; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java index 5f7027d63..ba721430e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java @@ -1,11 +1,11 @@ package org.briarproject.briar.android.conversation; -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.ConversationRequest; import org.briarproject.briar.api.sharing.InvitationRequest; import org.briarproject.briar.api.sharing.Shareable; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java index d5f578339..86c713368 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.conversation; import android.view.View; import android.widget.Button; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationScrollListener.java index da90aa0cf..9b996fc49 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationScrollListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationScrollListener.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.conversation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.view.BriarRecyclerViewScrollListener; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault class ConversationScrollListener extends diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsDialog.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsDialog.java index b3c8417b2..6030fd224 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsDialog.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsDialog.java @@ -8,12 +8,12 @@ import android.view.ViewGroup; import android.widget.Button; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.widget.OnboardingFullDialogFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index dcc42e49c..379f00c37 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -16,7 +16,6 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.sync.GroupId; @@ -47,6 +46,7 @@ import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.api.messaging.PrivateMessageFormat; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java index 061a57ccb..ee887e1b1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.conversation; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItem; @@ -16,6 +15,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; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index 67db6804a..63004390c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java @@ -16,8 +16,6 @@ import android.widget.TextView; import com.google.android.material.appbar.AppBarLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -26,6 +24,8 @@ import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.util.ActivityLaunchers.CreateDocumentAdvanced; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.PullDownLayout; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java index 02f97730c..032bcdfe5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java @@ -8,10 +8,10 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.conversation.glide.Radii; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java index c80308b0b..94135a7d1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java @@ -14,13 +14,13 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.github.chrisbanes.photoview.PhotoView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.conversation.glide.GlideApp; +import org.briarproject.nullsafety.MethodsNotNullByDefault; import javax.annotation.ParametersAreNonnullByDefault; import javax.inject.Inject; @@ -34,11 +34,11 @@ import androidx.lifecycle.ViewModelProvider; import static android.os.Build.VERSION.SDK_INT; import static android.widget.ImageView.ScaleType.FIT_START; import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.briar.android.attachment.AttachmentItem.State.AVAILABLE; import static org.briarproject.briar.android.attachment.AttachmentItem.State.ERROR; import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT_POSITION; import static org.briarproject.briar.android.conversation.ImageActivity.ITEM_ID; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @MethodsNotNullByDefault @ParametersAreNonnullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java index 3f1ee6568..63fe2acbd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java @@ -5,8 +5,8 @@ import android.content.res.Resources; import android.graphics.Rect; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ItemDecoration; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java index a2dba12e2..4370b5604 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java @@ -6,13 +6,13 @@ import android.widget.ImageView; import com.bumptech.glide.load.Transformation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.conversation.glide.BriarImageTransformation; import org.briarproject.briar.android.conversation.glide.GlideApp; import org.briarproject.briar.android.conversation.glide.Radii; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.DrawableRes; import androidx.recyclerview.widget.RecyclerView.ViewHolder; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java index b8a7ff902..c832f45da 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java @@ -14,7 +14,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.attachment.AttachmentItem; @@ -24,6 +23,7 @@ import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.attachment.Attachment; import org.briarproject.briar.api.attachment.AttachmentReader; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileOutputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java index 5fee04f20..9a2d4143d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.conversation; import android.view.View; import android.widget.ImageView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java index 44bb41aa0..651a0ff8e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java @@ -6,10 +6,10 @@ import com.bumptech.glide.load.data.DataFetcher; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.attachment.Attachment; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.AttachmentReader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcherFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcherFactory.java index 63867df74..31eca56f8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcherFactory.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcherFactory.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.conversation.glide; import org.briarproject.bramble.api.db.DatabaseExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.AttachmentReader; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarGlideModule.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarGlideModule.java index b269a0307..636968c8b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarGlideModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarGlideModule.java @@ -8,9 +8,9 @@ import com.bumptech.glide.Registry; import com.bumptech.glide.annotation.GlideModule; import com.bumptech.glide.module.AppGlideModule; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.BriarApplication; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoader.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoader.java index 952a3bf6f..1bb791ed3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoader.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoader.java @@ -5,10 +5,10 @@ import com.bumptech.glide.load.Options; import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.signature.ObjectKey; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.android.BriarApplication; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoaderFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoaderFactory.java index adb6b95e8..038657126 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoaderFactory.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoaderFactory.java @@ -4,9 +4,9 @@ import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.BriarApplication; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java index 3c237be6f..2a8918d64 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java @@ -9,7 +9,7 @@ import android.graphics.RectF; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.MessageDigest; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java index 4f773edd0..e129d94c1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.conversation.glide; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java index c17592e37..e6988ea18 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java @@ -12,14 +12,14 @@ import android.widget.Toast; import com.google.android.material.textfield.TextInputLayout; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; @@ -36,7 +36,6 @@ import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.briar.android.util.UiUtils.enterPressed; import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; -import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard; import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_NAME_LENGTH; @MethodsNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java index abb30abc5..364d730b1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java @@ -7,8 +7,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.sharing.ForumSharingStatusActivity; @@ -16,6 +14,8 @@ import org.briarproject.briar.android.sharing.ShareForumActivity; import org.briarproject.briar.android.threaded.ThreadItemAdapter; import org.briarproject.briar.android.threaded.ThreadListActivity; import org.briarproject.briar.android.threaded.ThreadListViewModel; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java index c97b491ae..65d15bc61 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java @@ -4,8 +4,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.recyclerview.widget.DiffUtil.ItemCallback; import androidx.recyclerview.widget.ListAdapter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java index 093968a68..3c8797371 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java @@ -12,14 +12,14 @@ import android.view.ViewGroup; import com.google.android.material.snackbar.Snackbar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.sharing.ForumInvitationActivity; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListViewModel.java index 76e56be51..d4da63301 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListViewModel.java @@ -11,8 +11,6 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupAddedEvent; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; @@ -27,6 +25,8 @@ import org.briarproject.briar.api.forum.ForumPostHeader; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent; import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collections; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java index 91c7a5613..f44427300 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java @@ -15,8 +15,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.api.system.Clock; @@ -35,6 +33,8 @@ import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent; import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java index 22f1be68d..76ee04fb0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java @@ -5,10 +5,10 @@ import android.content.Context; import android.os.Bundle; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.android.DestroyableContext; import org.briarproject.briar.android.activity.ActivityComponent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.CallSuper; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java index c6e1d85f8..fd34b8d38 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java @@ -6,9 +6,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java index daddcf4b0..d6cacf4f8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java @@ -10,9 +10,9 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.activity.OnBackPressedCallback; import androidx.annotation.ColorRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java index 26484301c..923f0f775 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java @@ -13,12 +13,12 @@ import android.view.View; import android.widget.CheckBox; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.api.android.ScreenFilterMonitor; import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java index 7d39be903..56f7af208 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java @@ -14,9 +14,9 @@ import android.widget.TextView; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java index 3b8d57bc8..62580156d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java @@ -11,11 +11,11 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ProgressBar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.util.ActivityLaunchers.CreateDocumentAdvanced; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; @@ -34,9 +34,9 @@ import static android.os.Build.VERSION.SDK_INT; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static androidx.transition.TransitionManager.beginDelayedTransition; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.briar.android.AppModule.getAndroidComponent; import static org.briarproject.briar.android.hotspot.HotspotViewModel.getApkFileName; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java index edbe226b7..492ddcc5f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java @@ -4,14 +4,14 @@ import android.content.Intent; import android.os.Bundle; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.hotspot.HotspotState.HotspotError; import org.briarproject.briar.android.hotspot.HotspotState.HotspotStarted; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java index eb0b73165..a90dbae9c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java @@ -7,10 +7,10 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java index 7decec77c..d4a2174f5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.hotspot; import android.os.Bundle; import android.view.View; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java index aef52c5ac..874cbbd3e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java index 85e386944..1a8223e67 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java @@ -14,9 +14,9 @@ import android.widget.TextView; import com.google.android.material.snackbar.Snackbar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java index 72df53b7c..e69dc19de 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java @@ -17,14 +17,14 @@ import android.util.DisplayMetrics; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.R; import org.briarproject.briar.android.hotspot.HotspotState.NetworkConfig; import org.briarproject.briar.android.qrcode.QrCodeUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.security.SecureRandom; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java index a152874eb..706e41dc4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.hotspot; import android.graphics.Bitmap; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java index a5b2d34f8..bac6b7d2e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.R; import org.briarproject.briar.android.hotspot.HotspotManager.HotspotListener; @@ -21,6 +20,7 @@ import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.android.AndroidNotificationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileInputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java index 4f2fa72f7..a97015db0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java @@ -10,9 +10,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java index a613804f5..2c3a767f4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java @@ -10,10 +10,10 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.hotspot.HotspotState.HotspotStarted; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServer.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServer.java index a4a05f9e1..a04dc92bc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServer.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServer.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.hotspot; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java index e212ebbaf..d5390993e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java @@ -5,10 +5,10 @@ import android.graphics.Bitmap; import android.util.DisplayMetrics; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.android.hotspot.HotspotState.WebsiteConfig; import org.briarproject.briar.android.qrcode.QrCodeUtils; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.net.InetAddress; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java index 6ccf4d9a7..31ff0b9ab 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.hotspot; import android.os.Bundle; import android.view.View; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java index 389a30fb6..edbe8a51e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java @@ -5,8 +5,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.ContactListAdapter; @@ -14,6 +12,8 @@ import org.briarproject.briar.android.contact.ContactListItem; import org.briarproject.briar.android.contact.OnContactClickListener; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index 1d4016e8c..23b4127a5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -8,8 +8,6 @@ import android.view.ViewGroup; import android.widget.ProgressBar; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.ContactItem; @@ -18,6 +16,8 @@ import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionViewModel.java index 77a898500..7a13a2e5e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionViewModel.java @@ -12,7 +12,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.ContactItem; @@ -23,6 +22,7 @@ import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.introduction.IntroductionManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java index 0256cf1b4..b926db994 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.logging; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java index 5037105e1..029d8fcf8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.logging; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java index 2295838de..c93d67a7e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.logging; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.AndroidUtils; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java index 61cfaa136..c24b45d86 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.logging; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.api.transport.StreamReaderFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileInputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java index 354e22ecc..982546d2f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.logging; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.AndroidUtils; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java index f868f6ed3..cdc175970 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java @@ -2,10 +2,10 @@ package org.briarproject.briar.android.logging; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.FileOutputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordViewModel.java index 9a622a15c..e6ffb1bbe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordViewModel.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.crypto.DecryptionException; import org.briarproject.bramble.api.crypto.DecryptionResult; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java index eb0869d91..fe706bc84 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.login; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.appcompat.app.AlertDialog; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java index f56c70522..a1f55fd13 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java @@ -7,11 +7,11 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java index c0ea14cb5..30d224c0a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java @@ -13,11 +13,11 @@ import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import org.briarproject.bramble.api.crypto.DecryptionResult; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java index 6c43e0126..71a806e8c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java @@ -3,8 +3,6 @@ package org.briarproject.briar.android.login; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.BriarService; import org.briarproject.briar.android.account.SetupActivity; @@ -12,6 +10,8 @@ import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.login.StartupViewModel.State; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java index 1a8d9d1f9..4d42630d1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java @@ -12,10 +12,10 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.android.AndroidNotificationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java index 5a56ff198..4e0ce178b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java @@ -5,10 +5,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java index ffc37c11a..47468e98a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java @@ -6,10 +6,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.FinalFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorWizardFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorWizardFragment.java index 44f9407fd..c0f789fb2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorWizardFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorWizardFragment.java @@ -12,10 +12,10 @@ import android.widget.ScrollView; import com.google.android.material.animation.ArgbEvaluatorCompat; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.BriarButton; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java index 1c57f3691..39908db6c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java @@ -6,13 +6,13 @@ import android.widget.ProgressBar; import android.widget.Toast; import org.briarproject.bramble.api.mailbox.MailboxPairingState; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.FinalFragment; import org.briarproject.briar.android.view.BlankFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxConnectingFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxConnectingFragment.java index 3361c01cd..3da20a80e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxConnectingFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxConnectingFragment.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxScanFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxScanFragment.java index 80afa4863..6b9c55653 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxScanFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxScanFragment.java @@ -7,11 +7,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.qrcode.CameraException; import org.briarproject.briar.android.qrcode.CameraView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java index f70476bea..6f3db3e58 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java @@ -14,10 +14,10 @@ import android.widget.ProgressBar; import android.widget.TextView; import org.briarproject.bramble.api.mailbox.MailboxStatus; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.BriarButton; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxViewModel.java index 0d4402a81..a3f38c272 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxViewModel.java @@ -18,7 +18,6 @@ import org.briarproject.bramble.api.mailbox.MailboxPairingState; import org.briarproject.bramble.api.mailbox.MailboxPairingTask; import org.briarproject.bramble.api.mailbox.MailboxStatus; import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TorConstants; @@ -31,6 +30,7 @@ import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.android.AndroidNotificationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java index 3ae1f6c18..740b10698 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java @@ -8,10 +8,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.navdrawer.TransportsActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineStatusFragment.java index ce2af02f8..aa46e5157 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineStatusFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineStatusFragment.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.mailbox; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java index 1d76a6c2f..74595a015 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java @@ -8,9 +8,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ScrollView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java index febe902a4..f3f231422 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java @@ -8,9 +8,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ScrollView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index adce3a302..bc1d32904 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -20,8 +20,6 @@ import com.google.android.material.navigation.NavigationView; import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.Plugin.State; @@ -40,6 +38,8 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener import org.briarproject.briar.android.logout.SignOutFragment; import org.briarproject.briar.android.privategroup.list.GroupListFragment; import org.briarproject.briar.android.settings.SettingsActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java index d4f047ff3..0d2bae46b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java @@ -6,12 +6,12 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.BriarApplication; import org.briarproject.briar.android.viewmodel.DbViewModel; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/PluginViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/PluginViewModel.java index f3a7e0810..5d0c48bcd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/PluginViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/PluginViewModel.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkStatus; import org.briarproject.bramble.api.network.event.NetworkStatusEvent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.Plugin; @@ -31,6 +30,7 @@ import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.viewmodel.DbViewModel; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java index d79b500d8..81de79aa4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java @@ -13,8 +13,6 @@ import android.widget.ImageView; import android.widget.TextView; import org.briarproject.bramble.api.network.NetworkStatus; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.Plugin.State; @@ -23,6 +21,8 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java index f75167fb4..8a76132c3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java @@ -4,10 +4,10 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java index d6e74b1bb..cc0b8289f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java @@ -6,8 +6,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.privategroup.creation.GroupInviteActivity; @@ -15,6 +13,8 @@ import org.briarproject.briar.android.privategroup.memberlist.GroupMemberListAct import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity; import org.briarproject.briar.android.threaded.ThreadListActivity; import org.briarproject.briar.android.threaded.ThreadListViewModel; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; @@ -25,10 +25,10 @@ import androidx.lifecycle.ViewModelProvider; import static android.view.View.GONE; import static android.view.View.VISIBLE; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_GROUP_INVITE; import static org.briarproject.briar.android.util.UiUtils.observeOnce; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_TEXT_LENGTH; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java index 4eedbd580..512ecdc6c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java @@ -4,11 +4,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder; import org.briarproject.briar.android.threaded.ThreadItemAdapter; import org.briarproject.briar.android.threaded.ThreadPostViewHolder; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.LayoutRes; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java index 5a6281f97..437d5136d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java @@ -14,8 +14,6 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.AndroidExecutor; @@ -37,6 +35,8 @@ import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent; import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent; import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java index 6ee712071..c95f92297 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java @@ -3,10 +3,10 @@ package org.briarproject.briar.android.privategroup.conversation; import android.content.Context; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java index deb020e27..4a5e1f035 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java @@ -4,14 +4,14 @@ import android.content.Intent; import android.os.Bundle; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; import org.briarproject.briar.android.privategroup.conversation.GroupActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java index ffd605c98..3daac8880 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java @@ -2,11 +2,11 @@ package org.briarproject.briar.android.privategroup.creation; 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.GroupId; import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.contactselection.SelectableContactItem; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java index 4bae607e8..35c707fd2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java @@ -12,7 +12,6 @@ import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl; @@ -27,6 +26,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; @@ -41,8 +41,8 @@ import androidx.annotation.Nullable; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @Immutable @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java index 141091fdd..95de304aa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java @@ -13,12 +13,12 @@ import android.widget.ProgressBar; import com.google.android.material.textfield.TextInputLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java index 19e8fefee..1092c3aa2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.privategroup.creation; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.sharing.BaseMessageFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.StringRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java index d859f29ef..f5fae56c9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java @@ -5,13 +5,13 @@ import android.os.Bundle; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contactselection.ContactSelectorActivity; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; import org.briarproject.briar.android.sharing.BaseMessageFragment.MessageFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java index ba1dda030..889a0aee7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java @@ -2,14 +2,14 @@ package org.briarproject.briar.android.privategroup.creation; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.contactselection.ContactSelectorFragment; import org.briarproject.briar.android.contactselection.SelectableContactItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationActivity.java index a6dd2dd4e..565d3ea24 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationActivity.java @@ -2,13 +2,13 @@ package org.briarproject.briar.android.privategroup.invitation; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.sharing.InvitationActivity; import org.briarproject.briar.android.sharing.InvitationAdapter; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationController.java index 0cb87e987..22b5837d2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationController.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.privategroup.invitation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.sharing.InvitationController; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface GroupInvitationController diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationControllerImpl.java index 1a2cae3ed..48b2706b1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationControllerImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.android.sharing.InvitationControllerImpl; @@ -15,6 +14,7 @@ import org.briarproject.briar.api.privategroup.event.GroupInvitationRequestRecei import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupItem.java index f7f361216..15a7900d3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupItem.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.privategroup.list; 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.briar.api.client.MessageTracker.GroupCount; +import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.privategroup.GroupMessageHeader; import org.briarproject.briar.api.privategroup.PrivateGroup; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListAdapter.java index a2a4805bc..849514a54 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListAdapter.java @@ -4,10 +4,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.privategroup.list.GroupViewHolder.OnGroupRemoveClickListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.recyclerview.widget.DiffUtil.ItemCallback; import androidx.recyclerview.widget.ListAdapter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java index dcd023e5f..0ed8a25b3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java @@ -12,8 +12,6 @@ import android.view.ViewGroup; import com.google.android.material.snackbar.Snackbar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; @@ -22,6 +20,8 @@ import org.briarproject.briar.android.privategroup.invitation.GroupInvitationAct import org.briarproject.briar.android.privategroup.list.GroupViewHolder.OnGroupRemoveClickListener; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.BriarRecyclerView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListViewModel.java index 35f6ada3e..474dbcefd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListViewModel.java @@ -11,8 +11,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupAddedEvent; @@ -31,6 +29,8 @@ import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent; import org.briarproject.briar.api.privategroup.event.GroupInvitationRequestReceivedEvent; import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java index 4179b4061..f1d2293dd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java @@ -7,13 +7,13 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.privategroup.conversation.GroupActivity; import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.view.TextAvatarView; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.recyclerview.widget.RecyclerView; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java index 7847f905c..267c9c9d0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java @@ -9,8 +9,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.briar.R; @@ -20,6 +18,8 @@ import org.briarproject.briar.android.controller.handler.UiResultExceptionHandle import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.api.privategroup.JoinMessageHeader; import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java index 2b57b4e69..5ce345852 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java @@ -4,8 +4,8 @@ import org.briarproject.bramble.api.contact.ContactId; 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.briar.api.privategroup.GroupMember; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java index dd3d958b7..f673800b3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java @@ -4,17 +4,17 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.AuthorView; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; import androidx.recyclerview.widget.RecyclerView; import static android.view.View.GONE; import static android.view.View.VISIBLE; -import static org.briarproject.briar.api.identity.AuthorInfo.Status.OURSELVES; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; +import static org.briarproject.briar.api.identity.AuthorInfo.Status.OURSELVES; @UiThread @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java index 5d7f70bff..201eaba17 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java @@ -11,14 +11,14 @@ import android.widget.Button; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contactselection.ContactSelectorActivity; import org.briarproject.briar.android.controller.handler.UiExceptionHandler; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsController.java index 52c38546b..6ec630bea 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsController.java @@ -2,11 +2,11 @@ package org.briarproject.briar.android.privategroup.reveal; 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.GroupId; import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java index edf50600c..50e7c06b0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.sync.GroupId; @@ -19,6 +18,7 @@ import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.privategroup.GroupMember; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsFragment.java index 4cf47c5f2..708596487 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsFragment.java @@ -4,13 +4,13 @@ import android.content.Context; import android.os.Bundle; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.OnContactClickListener; import org.briarproject.briar.android.contactselection.BaseContactSelectorFragment; import org.briarproject.briar.android.contactselection.ContactSelectorController; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactAdapter.java index 271b97ebb..d4af86f3c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactAdapter.java @@ -6,10 +6,10 @@ import android.view.View; import android.view.ViewGroup; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.OnContactClickListener; import org.briarproject.briar.android.contactselection.BaseContactSelectorAdapter; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactItem.java index 57f84947f..e298f30f5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactItem.java @@ -1,10 +1,10 @@ package org.briarproject.briar.android.privategroup.reveal; import org.briarproject.bramble.api.contact.Contact; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.contactselection.SelectableContactItem; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.privategroup.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java index 02bfa90a9..bb13f100c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java @@ -3,10 +3,10 @@ package org.briarproject.briar.android.privategroup.reveal; import android.view.View; import android.widget.ImageView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.OnContactClickListener; import org.briarproject.briar.android.contactselection.BaseSelectableContactHolder; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/CameraView.java index 1540e7685..cff3f2c08 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/CameraView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/CameraView.java @@ -14,8 +14,8 @@ import android.view.SurfaceView; import android.view.View; import android.view.WindowManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/PreviewConsumer.java b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/PreviewConsumer.java index 3eb8832bc..20a6436bd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/PreviewConsumer.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/PreviewConsumer.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.qrcode; import android.hardware.Camera; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeDecoder.java b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeDecoder.java index d03c841b3..b5c96079a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeDecoder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeDecoder.java @@ -14,10 +14,10 @@ import com.google.zxing.common.HybridBinarizer; import com.google.zxing.qrcode.QRCodeReader; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeUtils.java index d7f30e0f3..0917f3776 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/qrcode/QrCodeUtils.java @@ -7,7 +7,7 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java index b23e60330..c6a4f9465 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java @@ -8,10 +8,10 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ScrollView; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.widget.OnboardingFullDialogFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java index c1bf9441c..7ab791b88 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java @@ -6,10 +6,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.FinalFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java index 1e7f5e308..c927d26ab 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java @@ -11,11 +11,11 @@ import android.widget.ProgressBar; import android.widget.ScrollView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.util.ActivityLaunchers.GetContentAdvanced; import org.briarproject.briar.android.util.ActivityLaunchers.OpenDocumentAdvanced; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveActivity.java index 501f458fb..91bd94d2f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveActivity.java @@ -5,8 +5,6 @@ import android.os.Bundle; import android.view.MenuItem; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -14,6 +12,8 @@ import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.fragment.FinalFragment; import org.briarproject.briar.android.removabledrive.RemovableDriveViewModel.Action; import org.briarproject.briar.android.removabledrive.TransferDataState.TaskAvailable; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java index 142526eef..96099cfee 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveManager; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask.State; @@ -19,6 +18,7 @@ import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java index 1acab3a93..a39326bba 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java @@ -13,11 +13,11 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; import org.briarproject.briar.R; import org.briarproject.briar.android.util.ActivityLaunchers.CreateDocumentAdvanced; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/TransferDataState.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/TransferDataState.java index e8ac85058..e8581aee5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/TransferDataState.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/TransferDataState.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.removabledrive; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.file.RemovableDriveTask; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault abstract class TransferDataState { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarExceptionHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarExceptionHandler.java index 870285954..a229717c2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarExceptionHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarExceptionHandler.java @@ -4,8 +4,8 @@ import android.app.Application; import android.os.Process; import android.util.Log; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.logging.LogEncrypter; +import org.briarproject.nullsafety.NotNullByDefault; import java.lang.Thread.UncaughtExceptionHandler; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java index 068899224..ef9e6ad94 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java @@ -21,7 +21,6 @@ import android.os.Build; import android.os.Environment; import org.briarproject.bramble.api.Pair; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.R; import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo; @@ -30,6 +29,7 @@ import org.briarproject.briar.android.reporting.ReportData.SingleReportInfo; import org.briarproject.briar.api.android.MemoryStats; import org.briarproject.briar.api.android.NetworkUsageMetrics; import org.briarproject.briar.api.android.NetworkUsageMetrics.Metrics; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; import java.io.PrintWriter; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java index 370adc927..cad46395a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java @@ -5,11 +5,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashReportActivity.java index fae4f2ada..940cd0b0d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashReportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashReportActivity.java @@ -7,8 +7,6 @@ import android.os.Looper; import android.os.Process; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; @@ -16,6 +14,8 @@ import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.logout.HideUiActivity; import org.briarproject.briar.api.android.MemoryStats; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java index a1c580766..9dcf854be 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.reporting; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.json.JSONException; import org.json.JSONObject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportDataAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportDataAdapter.java index a49e67b20..53ac3445d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportDataAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportDataAdapter.java @@ -6,9 +6,9 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.reporting.ReportData.ReportItem; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java index fb7746f51..8eff6d704 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java @@ -16,11 +16,11 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java index 3ebd47097..1aba53d7b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java @@ -4,7 +4,6 @@ import android.app.Application; import android.os.Handler; import android.os.Looper; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TorConstants; @@ -20,6 +19,7 @@ import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; import org.briarproject.briar.api.android.MemoryStats; import org.briarproject.briar.api.android.NetworkUsageMetrics; +import org.briarproject.nullsafety.NotNullByDefault; import org.json.JSONException; import java.io.File; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index e29bb6538..664e7f286 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -10,10 +10,10 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AvatarPreference.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AvatarPreference.java index 77812b14f..670d83b2e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AvatarPreference.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AvatarPreference.java @@ -5,8 +5,8 @@ import android.util.AttributeSet; import android.view.View; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java index c3d200aa4..72775dd20 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java @@ -11,11 +11,11 @@ import android.widget.TextView; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.conversation.glide.GlideApp; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java index f669636f6..afb594ab5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java @@ -4,9 +4,9 @@ import android.content.Context; import android.os.Bundle; import android.view.View; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsManager.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsManager.java index 61fbfd6e4..16eabf930 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsManager.java @@ -1,11 +1,11 @@ package org.briarproject.briar.android.settings; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.TorConstants; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsStore.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsStore.java index 94a12d53b..ed7046e6b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsStore.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsStore.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.settings; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.SettingsManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/DisplayFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/DisplayFragment.java index 3103a6804..f71a7d00f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/DisplayFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/DisplayFragment.java @@ -4,10 +4,10 @@ import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.Localizer; import org.briarproject.briar.android.util.UiUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Arrays; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsFragment.java index b39192743..958680e77 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsFragment.java @@ -8,9 +8,9 @@ import android.os.Bundle; import android.view.View; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsManager.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsManager.java index 83a18c0ce..5ed3fd1e1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/NotificationsManager.java @@ -7,11 +7,11 @@ import android.net.Uri; import android.widget.Toast; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/OwnIdentityInfo.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/OwnIdentityInfo.java index b6a3780f3..5b44d9326 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/OwnIdentityInfo.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/OwnIdentityInfo.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.settings; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java index 36a10f228..a35380fc9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java @@ -4,9 +4,9 @@ import android.content.Context; import android.os.Bundle; import android.view.View; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java index 18b3c0f6c..00e4583a2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java @@ -3,11 +3,11 @@ package org.briarproject.briar.android.settings; import android.os.Bundle; import android.view.MenuItem; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 348fcc4ac..beae77740 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -6,12 +6,12 @@ import android.net.Uri; import android.os.Bundle; import android.view.View; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.mailbox.MailboxActivity; import org.briarproject.briar.android.util.ActivityLaunchers.GetImageAdvanced; import org.briarproject.briar.android.util.ActivityLaunchers.OpenImageDocumentAdvanced; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsStore.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsStore.java index b5752de51..a7dfcfb36 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsStore.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsStore.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.settings; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.Executor; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java index df1788712..85cc559e4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java @@ -16,8 +16,6 @@ import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.TorConstants; @@ -34,6 +32,8 @@ import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.api.avatar.AvatarManager; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java index 5e0ba6e8b..73c7d24ae 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java @@ -2,10 +2,10 @@ package org.briarproject.briar.android.settings; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.plugin.tor.CircumventionProvider; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.preference.ListPreference; import androidx.preference.Preference.SummaryProvider; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index bd2d368c2..2d74dd235 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -7,9 +7,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.LargeTextInputView; @@ -17,6 +14,9 @@ import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.android.view.TextSendController.SendState; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationActivity.java index e49b63278..a3256309a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationActivity.java @@ -2,11 +2,11 @@ package org.briarproject.briar.android.sharing; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.api.sharing.SharingInvitationItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationControllerImpl.java index 62e633016..9854e8d2f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogInvitationControllerImpl.java @@ -6,13 +6,13 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.blog.event.BlogInvitationRequestReceivedEvent; import org.briarproject.briar.api.sharing.SharingInvitationItem; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogSharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogSharingStatusActivity.java index 35d606f96..d5f587a93 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogSharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogSharingStatusActivity.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.api.blog.BlogInvitationResponse; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationActivity.java index 59fb3683b..67b3a0f66 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationActivity.java @@ -2,11 +2,11 @@ package org.briarproject.briar.android.sharing; import android.content.Context; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.api.sharing.SharingInvitationItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationControllerImpl.java index 0979afe6a..1ee143d31 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumInvitationControllerImpl.java @@ -6,13 +6,13 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent; import org.briarproject.briar.api.sharing.SharingInvitationItem; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java index 3c8203128..e7e1ee189 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.api.forum.ForumInvitationResponse; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java index e82b19ad6..e145a6961 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java @@ -5,8 +5,6 @@ import android.os.Bundle; import android.widget.Toast; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.controller.handler.UiExceptionHandler; @@ -14,6 +12,8 @@ import org.briarproject.briar.android.controller.handler.UiResultExceptionHandle import org.briarproject.briar.android.sharing.InvitationController.InvitationListener; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.api.sharing.InvitationItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationController.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationController.java index f4e3949c0..a9a8a654b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationController.java @@ -1,11 +1,11 @@ package org.briarproject.briar.android.sharing; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.controller.ActivityLifecycleController; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; import org.briarproject.briar.api.sharing.InvitationItem; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java index 47b0ba5b7..54b4af317 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java @@ -9,14 +9,14 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.event.GroupAddedEvent; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.briar.android.controller.DbControllerImpl; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; import org.briarproject.briar.api.sharing.InvitationItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java index dbba270a2..74c9ce5dd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java @@ -4,11 +4,11 @@ import android.content.Intent; import android.os.Bundle; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.contactselection.ContactSelectorActivity; import org.briarproject.briar.android.sharing.BaseMessageFragment.MessageFragmentListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java index 9bc3cda43..8b9d5cf83 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java @@ -5,11 +5,11 @@ import android.widget.Toast; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.controller.handler.UiExceptionHandler; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java index f07cdd130..abb14de67 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.db.NoSuchGroupException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogFragment.java index ab0d97e1c..3e28ac119 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogFragment.java @@ -2,13 +2,13 @@ package org.briarproject.briar.android.sharing; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.contactselection.ContactSelectorFragment; import org.briarproject.briar.android.contactselection.SelectableContactItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java index e2ed19bc3..80905e347 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java index f2c1d63e5..2e6385a16 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java @@ -5,11 +5,11 @@ import android.widget.Toast; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.controller.handler.UiExceptionHandler; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java index dcbf5af91..92d8eb8a3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.db.NoSuchGroupException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl; import org.briarproject.briar.android.controller.handler.ExceptionHandler; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumFragment.java index c7bdd59fd..88725262e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumFragment.java @@ -2,13 +2,13 @@ package org.briarproject.briar.android.sharing; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.contactselection.ContactSelectorFragment; import org.briarproject.briar.android.contactselection.SelectableContactItem; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java index b86bcb0fe..58698bfcf 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java @@ -5,9 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingController.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingController.java index 3fd3f4e96..d0e3ed8f8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingController.java @@ -2,7 +2,7 @@ package org.briarproject.briar.android.sharing; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingControllerImpl.java index b58ab1a08..3a70d3803 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingControllerImpl.java @@ -5,9 +5,9 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; import java.util.HashSet; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java index db667f051..fcee4d10d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java @@ -12,8 +12,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.briar.R; @@ -23,6 +21,8 @@ import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java index 43cf53988..c9fe83229 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java @@ -3,14 +3,14 @@ package org.briarproject.briar.android.splash; import android.content.Intent; import android.os.Bundle; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLockManager; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.controller.BriarController; import org.briarproject.briar.android.logout.ExitActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java index b8905f764..b98944566 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java @@ -7,12 +7,12 @@ import android.os.Handler; import android.transition.Fade; import org.briarproject.bramble.api.account.AccountManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java index ee31ff5e6..3de0b5ce5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java @@ -9,11 +9,11 @@ import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; import org.briarproject.briar.android.view.AuthorView; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.CallSuper; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java index bde7c3e7d..979fcad9e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java @@ -1,10 +1,10 @@ package org.briarproject.briar.android.threaded; 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.MessageTree.MessageNode; +import org.briarproject.briar.api.identity.AuthorInfo; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java index 7e5bf01ae..cca103919 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java @@ -4,10 +4,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; import org.briarproject.briar.android.util.ItemReturningAdapter; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index 40933e20f..003061618 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -6,8 +6,6 @@ import android.view.MenuItem; import com.google.android.material.snackbar.Snackbar; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; @@ -22,6 +20,8 @@ import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.android.view.TextSendController.SendState; import org.briarproject.briar.android.view.UnreadMessageButton; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java index 88a4b0fce..ecd6ffde5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java @@ -12,8 +12,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; @@ -27,6 +25,8 @@ import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.client.MessageTree; import org.briarproject.briar.client.MessageTreeImpl; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; import java.util.concurrent.Executor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java index 71c028b14..eb9be9acb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java @@ -3,9 +3,9 @@ package org.briarproject.briar.android.threaded; import android.view.View; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java index e0f1ec327..6871f9068 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.threaded; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.view.BriarRecyclerViewScrollListener; import org.briarproject.briar.android.view.UnreadMessageButton; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/ActivityLaunchers.java b/briar-android/src/main/java/org/briarproject/briar/android/util/ActivityLaunchers.java index f71755596..186c9b7ee 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/ActivityLaunchers.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/ActivityLaunchers.java @@ -3,7 +3,7 @@ package org.briarproject.briar.android.util; import android.content.Context; import android.content.Intent; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.activity.result.contract.ActivityResultContract; import androidx.activity.result.contract.ActivityResultContracts.CreateDocument; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java index 785befbeb..178e5e2df 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java @@ -6,8 +6,8 @@ import android.view.View.OnClickListener; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar.Callback; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.ColorRes; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java index 0952431bc..baa893964 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java @@ -34,14 +34,14 @@ import com.google.android.material.textfield.TextInputLayout; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.reporting.FeedbackActivity; import org.briarproject.briar.android.view.ArticleMovementMethod; import org.briarproject.briar.api.android.MemoryStats; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.Locale; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BlankFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BlankFragment.java index 6014e8994..3c25b4bfb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BlankFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BlankFragment.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.view; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.fragment.app.Fragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java index 261a76c32..944cb8587 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java @@ -8,8 +8,8 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.ProgressBar; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.appcompat.view.ContextThemeWrapper; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java index 7c23c894b..52b25e093 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java @@ -1,7 +1,7 @@ package org.briarproject.briar.android.view; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.util.ItemReturningAdapter; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.CallSuper; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java index 661ddaefa..150644ae6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java @@ -4,9 +4,9 @@ import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItemResult; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java index c11a70363..0a94a0984 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java @@ -4,9 +4,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItemResult; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java index ea4893ed7..7c8a2e69c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java @@ -5,8 +5,8 @@ import android.content.res.Resources; import android.graphics.Rect; import android.view.View; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ItemDecoration; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java index 004b5fd48..c7998ae57 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.view; import android.net.Uri; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java index 5d75f85c3..924da875c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java @@ -10,9 +10,9 @@ import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.conversation.glide.GlideApp; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.DrawableRes; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java index d3f34fa4f..ed08ca394 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java @@ -6,9 +6,9 @@ import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.Button; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java index 8050438e3..2503f4ecd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java @@ -31,7 +31,7 @@ import android.view.View; import android.view.ViewConfiguration; import android.widget.FrameLayout; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java index 7444c9557..77d0cc9fa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java @@ -6,7 +6,7 @@ import android.view.View; import com.google.android.material.snackbar.Snackbar.SnackbarLayout; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index f6b751412..2e65125b4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -9,12 +9,12 @@ import android.os.Parcel; import android.os.Parcelable; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItemResult; import org.briarproject.briar.android.attachment.AttachmentManager; import org.briarproject.briar.android.attachment.AttachmentResult; import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 18c7521ba..33050f417 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -9,10 +9,10 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.EmojiTextInputView.OnKeyboardShownListener; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import androidx.annotation.LayoutRes; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index 0d6c432c7..5a0352a60 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -7,10 +7,10 @@ import android.widget.Toast; import com.google.android.material.snackbar.Snackbar; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener; import org.briarproject.briar.api.attachment.AttachmentHeader; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java index 24a1df1c4..9d35d96a5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java @@ -9,8 +9,8 @@ import android.widget.TextView; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Locale; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/DbViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/DbViewModel.java index 583a42f16..f102ffec3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/DbViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/DbViewModel.java @@ -9,9 +9,9 @@ import org.briarproject.bramble.api.db.DbRunnable; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.briar.android.util.UiUtils; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java index e4e8e8308..ad78e3221 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.viewmodel; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java index dffb946b1..42b039efa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.viewmodel; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; import androidx.core.util.Consumer; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/MutableLiveEvent.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/MutableLiveEvent.java index fda307d5d..d2dda4053 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/MutableLiveEvent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/MutableLiveEvent.java @@ -1,6 +1,6 @@ package org.briarproject.briar.android.viewmodel; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public class MutableLiveEvent extends LiveEvent { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java index 19ee29469..a1dbdd348 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java @@ -15,7 +15,7 @@ */ package org.briarproject.briar.android.viewmodel; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; import java.util.Map.Entry; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java index 481c298a7..ee84b8b5e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java @@ -13,9 +13,9 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/OnboardingFullDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/OnboardingFullDialogFragment.java index cf2fd2d72..14b2f537f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/OnboardingFullDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/OnboardingFullDialogFragment.java @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java index 9215b75dc..fa5d210f9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java @@ -5,8 +5,8 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.util.UiUtils; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/TouchInterceptingLinearLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/TouchInterceptingLinearLayout.java index 8e3955c0b..f5b735d16 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/TouchInterceptingLinearLayout.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/TouchInterceptingLinearLayout.java @@ -6,7 +6,7 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.LinearLayout; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import androidx.annotation.Nullable; diff --git a/briar-android/src/main/java/org/briarproject/briar/api/android/NetworkUsageMetrics.java b/briar-android/src/main/java/org/briarproject/briar/api/android/NetworkUsageMetrics.java index 2dc1a115d..a2368dd89 100644 --- a/briar-android/src/main/java/org/briarproject/briar/api/android/NetworkUsageMetrics.java +++ b/briar-android/src/main/java/org/briarproject/briar/api/android/NetworkUsageMetrics.java @@ -1,7 +1,7 @@ package org.briarproject.briar.api.android; import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault public interface NetworkUsageMetrics extends Service { diff --git a/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java b/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java index 9d1cb9a0c..4bad1964d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java @@ -1,6 +1,6 @@ package org.briarproject.briar.api.android; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingTestModule.java b/briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingTestModule.java index a4bbb6165..8d8483fef 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingTestModule.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingTestModule.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.logging; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.reporting.DevConfig; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git 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 index a6abd37b4..3a180e09c 100644 --- 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; diff --git 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 index ab1efe121..f2f8b4b75 100644 --- 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; diff --git 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 index b5e2bc7f3..1c79141e4 100644 --- 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; diff --git 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 index a3f392985..f03869f21 100644 --- 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; diff --git 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 index 407f0363b..80f6fa8a0 100644 --- 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; diff --git 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 index 631ceb27d..2e74068ba 100644 --- 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; diff --git 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 index 382b1572a..75c96d2ae 100644 --- 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; diff --git 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 index a0e4fff02..6347303c4 100644 --- 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; diff --git 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 index 02ab6a2d5..5890ec990 100644 --- 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; diff --git 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 index a9d057501..448eff9d4 100644 --- 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 { diff --git 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 index 2f2db1da8..98d329072 100644 --- 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; diff --git 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 index c1fc813ef..f8a9adaec 100644 --- 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 { diff --git 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 index 9953cbac4..b7cc96f41 100644 --- 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; diff --git 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 index 53037b732..442d7ae5e 100644 --- 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; diff --git 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 index 1b7cd03de..d1f52ec8e 100644 --- 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; diff --git 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 index 4d99b10f9..f230f6f9f 100644 --- 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; diff --git 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 index 9a6d6b8da..a63bd74c6 100644 --- 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; diff --git 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 index d7f5e4da7..ab82c8aa9 100644 --- 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; diff --git 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 index 77d9892cb..586ad3212 100644 --- 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; diff --git 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 index d26b8190f..cac5a37bc 100644 --- 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; diff --git 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 index 717e9b31d..6f483d3cb 100644 --- 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; diff --git 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 index 579059a01..6636e01c6 100644 --- 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; diff --git 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 index 2bd0a0668..8298f7b6b 100644 --- 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; diff --git 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 index 9957d8dfa..c1c4a78b4 100644 --- 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; diff --git 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 index 07494d0f3..ba9389137 100644 --- 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; diff --git 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 index 71a1b442b..75a35954d 100644 --- 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; diff --git 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 index 2c869d9f3..dd8dc3519 100644 --- 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; diff --git 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 index e648869bb..515562aa4 100644 --- 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; diff --git 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 index 4846088b6..cdae24ea2 100644 --- 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 { diff --git 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 index 62d33ca46..a379da623 100644 --- 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; diff --git 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 index 19abb9ea7..e6e42d48b 100644 --- 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; diff --git 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 index b8c7b20af..73cc8dccc 100644 --- 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; diff --git 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 index 2a070a533..d79655db4 100644 --- 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; diff --git 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 index 6a6889a0f..e683c3201 100644 --- 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; diff --git 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 index ef747723d..18a469c72 100644 --- 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; diff --git 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 index f0fcf5cd3..d51c2b001 100644 --- 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; diff --git 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 index 98cabde3e..a57c8b6ed 100644 --- 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; diff --git 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 index 1b14a06be..07fa9bf59 100644 --- 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 { diff --git 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 index 954e344bf..60ace0fa5 100644 --- 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; diff --git 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 index 3b2e46367..0eb67c638 100644 --- 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; diff --git 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 index cb1e0878b..1b0cd636c 100644 --- 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; diff --git 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 index fe35ca6dd..038e2620d 100644 --- 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; diff --git 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 index 3abe250df..812bda447 100644 --- 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; diff --git 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 index ebf93b621..1f5df8b4f 100644 --- 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; diff --git 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 index 85084858f..064ca32fd 100644 --- 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; diff --git 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 index 5a99517bf..5b54cc31f 100644 --- 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; diff --git 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 index 28582acf6..fb654b055 100644 --- 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; diff --git 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 index 098531aa3..39be5b570 100644 --- 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; diff --git 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 index 46381a3c0..22f262792 100644 --- 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 { diff --git 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 index 53c690398..84b4b3028 100644 --- 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; diff --git 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 index bc342596e..8f624e29c 100644 --- 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; diff --git 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 index 716432e3c..fdb5c15c5 100644 --- 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; diff --git 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 index 38f0bd44c..e70ceb25f 100644 --- 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; diff --git 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 index 113ba400e..bbce380c1 100644 --- 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; diff --git 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 index 9d6e6c685..0a6a4e993 100644 --- 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; diff --git 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 index cf205ca77..828b53ffc 100644 --- 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; diff --git 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 index c1f17e187..31c928d62 100644 --- 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; diff --git 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 index 23bc39dde..f7e1abef3 100644 --- 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; diff --git 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 index b3274a057..c25d142aa 100644 --- 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; diff --git 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 index afe3638b1..212da1e25 100644 --- 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; diff --git 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 index e5f6e2b4f..bde9ea9c6 100644 --- 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; diff --git 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 index 32e2d3a56..0b40f09b3 100644 --- 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; diff --git 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 index 5f842f020..03deb49c2 100644 --- 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; diff --git 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 index 7f57e1c12..c63ba6474 100644 --- 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; diff --git 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 index 03b0ea3fd..cc6672958 100644 --- 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; diff --git 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 index 724b077cb..f703493e2 100644 --- 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; diff --git 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 index f84b59d82..518cc54d9 100644 --- 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; diff --git 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 index 9927ae4f2..2f31d1646 100644 --- 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; diff --git 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 index 37303c868..216849c41 100644 --- 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; diff --git 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 index 759128c8a..59b69417a 100644 --- 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 { diff --git 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 index ba1fb730c..ceeb8d9c6 100644 --- 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; diff --git 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 index c8c97c1ba..c8932a416 100644 --- 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; diff --git 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 index 31a2b2ee0..47de866ed 100644 --- 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; diff --git 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 index 030bd266f..df16b8243 100644 --- 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; diff --git 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 index 71edf29fb..9bd21364a 100644 --- 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; diff --git 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 index 74619ffe8..8656dde4e 100644 --- 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; diff --git 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 index 80c25bd0b..55effdd98 100644 --- 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; diff --git 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 index 061afd6e1..58f024ada 100644 --- 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; diff --git 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 index 215e3b756..84c31cb33 100644 --- 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; diff --git 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 index 061064e9c..f552d4859 100644 --- 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; diff --git 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 index 0282145f2..1bd151e2c 100644 --- 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; diff --git 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 index 0f7d06367..8c352e5e1 100644 --- 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; diff --git 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 index 34735e794..0a3e23f27 100644 --- 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; diff --git 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 index c04f210f3..e197f8a96 100644 --- 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 { diff --git 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 index e04a38cf2..8cd995138 100644 --- 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; diff --git 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 index e3de2fd91..87241aacb 100644 --- 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; diff --git 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 index 69ffbab3c..66afdb19c 100644 --- 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; diff --git 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 index b96100e0f..b40fd67d3 100644 --- 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 { diff --git a/briar-core/src/main/java/org/briarproject/briar/attachment/CountingInputStream.java b/briar-core/src/main/java/org/briarproject/briar/attachment/CountingInputStream.java index 8c1d8ecf9..b0190c3d6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/attachment/CountingInputStream.java +++ b/briar-core/src/main/java/org/briarproject/briar/attachment/CountingInputStream.java @@ -1,6 +1,6 @@ package org.briarproject.briar.attachment; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-core/src/main/java/org/briarproject/briar/autodelete/AutoDeleteManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/autodelete/AutoDeleteManagerImpl.java index 5a4d87d86..666839767 100644 --- a/briar-core/src/main/java/org/briarproject/briar/autodelete/AutoDeleteManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/autodelete/AutoDeleteManagerImpl.java @@ -12,11 +12,11 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.briar.api.autodelete.AutoDeleteManager; import org.briarproject.briar.api.autodelete.event.AutoDeleteTimerMirroredEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.logging.Logger; diff --git a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarManagerImpl.java index ab3097bd2..2c720367c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarManagerImpl.java @@ -16,7 +16,6 @@ import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupFactory; @@ -31,6 +30,7 @@ import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.avatar.AvatarManager; import org.briarproject.briar.api.avatar.AvatarMessageEncoder; import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarMessageEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarMessageEncoderImpl.java index c4308a469..cecd152e4 100644 --- a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarMessageEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarMessageEncoderImpl.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; -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.system.Clock; import org.briarproject.briar.api.attachment.FileTooBigException; import org.briarproject.briar.api.avatar.AvatarMessageEncoder; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java index 9f0b6c532..30ec7cb37 100644 --- a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.data.BdfReader; import org.briarproject.bramble.api.data.BdfReaderFactory; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; @@ -15,6 +14,7 @@ import org.briarproject.bramble.api.sync.MessageContext; import org.briarproject.bramble.api.sync.validation.MessageValidator; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.attachment.CountingInputStream; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/briar-core/src/main/java/org/briarproject/briar/blog/BlogFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/blog/BlogFactoryImpl.java index ca7887f0d..ae71e5b8d 100644 --- a/briar-core/src/main/java/org/briarproject/briar/blog/BlogFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/blog/BlogFactoryImpl.java @@ -4,11 +4,11 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java index c37c8c290..2c55ff4fd 100644 --- a/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -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; @@ -33,6 +32,7 @@ import org.briarproject.briar.api.blog.MessageType; import org.briarproject.briar.api.blog.event.BlogPostAddedEvent; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; diff --git a/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostFactoryImpl.java index 12e2ff435..4bef7fe85 100644 --- a/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostFactoryImpl.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; 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; @@ -13,6 +12,7 @@ import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.blog.MessageType; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostValidator.java b/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostValidator.java index 86347dd34..d4c135281 100644 --- a/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/blog/BlogPostValidator.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.bramble.api.sync.InvalidMessageException; @@ -19,6 +18,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.MessageType; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/client/ConversationClientImpl.java b/briar-core/src/main/java/org/briarproject/briar/client/ConversationClientImpl.java index aeae27899..a7a2a5e8d 100644 --- a/briar-core/src/main/java/org/briarproject/briar/client/ConversationClientImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/client/ConversationClientImpl.java @@ -8,11 +8,11 @@ import org.briarproject.bramble.api.data.MetadataParser; import org.briarproject.bramble.api.db.DatabaseComponent; 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.MessageTracker; import org.briarproject.briar.api.client.MessageTracker.GroupCount; import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/client/MessageTrackerImpl.java b/briar-core/src/main/java/org/briarproject/briar/client/MessageTrackerImpl.java index 4c7c65030..1da615926 100644 --- a/briar-core/src/main/java/org/briarproject/briar/client/MessageTrackerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/client/MessageTrackerImpl.java @@ -7,12 +7,12 @@ import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.db.DatabaseComponent; 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.bramble.api.system.Clock; import org.briarproject.briar.api.client.MessageTracker; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java b/briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java index caca96b11..7f08fe97b 100644 --- a/briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java @@ -1,8 +1,8 @@ package org.briarproject.briar.client; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.client.MessageTree; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java index d1f04ffcc..ee2589f42 100644 --- a/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; -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; @@ -17,6 +16,7 @@ import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.DeletionResult; import org.briarproject.briar.api.conversation.event.ConversationMessageTrackedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java index 323bf7cfa..b200ec451 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java @@ -22,7 +22,6 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TorConstants; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; @@ -40,6 +39,7 @@ import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.feed.Feed; import org.briarproject.briar.api.feed.FeedManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java index e49acc5ee..4237cdc54 100644 --- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java @@ -3,12 +3,12 @@ package org.briarproject.briar.forum; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java index a5dc6cebc..1bd80f4e3 100644 --- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java @@ -12,7 +12,6 @@ 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.identity.LocalAuthor; -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; @@ -28,6 +27,7 @@ import org.briarproject.briar.api.forum.ForumPostHeader; import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostFactoryImpl.java index c07987d9c..a27df2acf 100644 --- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostFactoryImpl.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; 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.briar.api.forum.ForumPost; import org.briarproject.briar.api.forum.ForumPostFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostValidator.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostValidator.java index 818a9b9e3..429e99330 100644 --- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumPostValidator.java @@ -9,12 +9,12 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/identity/AuthorManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/identity/AuthorManagerImpl.java index 7b1b64ec0..225169047 100644 --- a/briar-core/src/main/java/org/briarproject/briar/identity/AuthorManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/identity/AuthorManagerImpl.java @@ -7,11 +7,11 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.avatar.AvatarManager; import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AbortMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AbortMessage.java index fe90afa3c..5c0140baf 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AbortMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AbortMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.introduction; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractIntroductionMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractIntroductionMessage.java index d72130337..5de9ce870 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractIntroductionMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractIntroductionMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.introduction; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java index faf65ae15..3f664bee7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java @@ -15,7 +15,6 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.GroupId; @@ -31,6 +30,7 @@ import org.briarproject.briar.api.identity.AuthorInfo; import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.introduction.IntroductionResponse; import org.briarproject.briar.api.introduction.event.IntroductionResponseReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AcceptMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AcceptMessage.java index e021ff7f8..06870f3e1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AcceptMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AcceptMessage.java @@ -1,12 +1,12 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.crypto.PublicKey; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; 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 java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/ActivateMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/ActivateMessage.java index 4f53f2c32..e2ccda646 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/ActivateMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/ActivateMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.introduction; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AuthMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AuthMessage.java index 09c09c35b..dd511166f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AuthMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AuthMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.introduction; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/DeclineMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/DeclineMessage.java index 631312019..137cd8abb 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/DeclineMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/DeclineMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.introduction; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java index 700317da9..6d48a89c5 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -37,6 +36,7 @@ import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.introduction.IntroductionRequest; import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.Collection; @@ -49,7 +49,6 @@ import javax.inject.Inject; import static java.lang.Math.max; import static java.util.logging.Level.WARNING; -import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.system.Clock.MIN_REASONABLE_TIME_MS; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_AUTH; @@ -59,6 +58,7 @@ import static org.briarproject.briar.introduction.IntroduceeState.LOCAL_DECLINED import static org.briarproject.briar.introduction.IntroduceeState.REMOTE_ACCEPTED; import static org.briarproject.briar.introduction.IntroduceeState.REMOTE_DECLINED; import static org.briarproject.briar.introduction.IntroduceeState.START; +import static org.briarproject.nullsafety.NullSafety.requireNonNull; @Immutable @NotNullByDefault diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeSession.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeSession.java index 80f9d95b3..1f7412a2f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeSession.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.GroupId; @@ -13,6 +12,7 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.introduction.Role; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeState.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeState.java index c422af82a..a86ae6ec7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeState.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeState.java @@ -1,7 +1,7 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java index 1fdc76c73..39396518e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java @@ -8,7 +8,6 @@ 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.IdentityManager; -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; @@ -21,6 +20,7 @@ import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.introduction.IntroducerSession.Introducee; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerSession.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerSession.java index 70fd6c0ac..93b6132dc 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerSession.java @@ -1,12 +1,12 @@ package org.briarproject.briar.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.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.introduction.Role; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerState.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerState.java index 809380647..b8e7eb7b1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerState.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerState.java @@ -1,7 +1,7 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionCryptoImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionCryptoImpl.java index 877c95d45..0cfae7b02 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionCryptoImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionCryptoImpl.java @@ -10,10 +10,10 @@ import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.introduction.IntroduceeSession.Common; import org.briarproject.briar.introduction.IntroduceeSession.Remote; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java index bc7bf0f3b..b3b1a6077 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java @@ -20,7 +20,6 @@ import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; @@ -42,6 +41,7 @@ import org.briarproject.briar.api.introduction.IntroductionResponse; import org.briarproject.briar.api.introduction.Role; import org.briarproject.briar.client.ConversationClientImpl; import org.briarproject.briar.introduction.IntroducerSession.Introducee; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionValidator.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionValidator.java index adaaa0aef..02fa86274 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionValidator.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoder.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoder.java index 516b3de2a..da73bb221 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoder.java @@ -3,13 +3,13 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; 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.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoderImpl.java index d4ff9cb4e..c8c575227 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageEncoderImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.GroupId; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageMetadata.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageMetadata.java index 581f48c4c..0c8b8e279 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageMetadata.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageMetadata.java @@ -1,7 +1,7 @@ package org.briarproject.briar.introduction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParser.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParser.java index 503dd4cc6..a6b158d23 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParser.java @@ -3,9 +3,9 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface MessageParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParserImpl.java index 9e0e33309..5fd50c59c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageParserImpl.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageType.java b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageType.java index 67365399b..54adacb17 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/MessageType.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/MessageType.java @@ -1,7 +1,7 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/PeerSession.java b/briar-core/src/main/java/org/briarproject/briar/introduction/PeerSession.java index 3c453d2fa..5e6b90ec3 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/PeerSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/PeerSession.java @@ -1,9 +1,9 @@ package org.briarproject.briar.introduction; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/ProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/ProtocolEngine.java index 8992b57bb..d0ab46a68 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/ProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/ProtocolEngine.java @@ -3,7 +3,7 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/RequestMessage.java b/briar-core/src/main/java/org/briarproject/briar/introduction/RequestMessage.java index b192f5e78..65c0b8ded 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/RequestMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/RequestMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/Session.java b/briar-core/src/main/java/org/briarproject/briar/introduction/Session.java index 086dfb1a2..ede5edf10 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/Session.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/Session.java @@ -1,8 +1,8 @@ package org.briarproject.briar.introduction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.introduction.Role; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoder.java b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoder.java index 70cfff1bb..1f0333b52 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoder.java @@ -2,7 +2,7 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionEncoder { diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoderImpl.java index 8f9819cf8..f8c18ba2e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionEncoderImpl.java @@ -4,13 +4,13 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.KeySetId; import org.briarproject.briar.introduction.IntroduceeSession.Common; import org.briarproject.briar.introduction.IntroduceeSession.Local; import org.briarproject.briar.introduction.IntroduceeSession.Remote; import org.briarproject.briar.introduction.IntroducerSession.Introducee; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; import java.util.Map.Entry; diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParser.java b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParser.java index c58cac3d9..00b8f4272 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParser.java @@ -2,10 +2,10 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; -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.introduction.Role; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParserImpl.java index 938a6a7ab..203ebec57 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/SessionParserImpl.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.sync.GroupId; @@ -20,6 +19,7 @@ import org.briarproject.briar.api.introduction.Role; import org.briarproject.briar.introduction.IntroduceeSession.Local; import org.briarproject.briar.introduction.IntroduceeSession.Remote; import org.briarproject.briar.introduction.IntroducerSession.Introducee; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.HashMap; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java index e8beca439..af0460fd9 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.NoSuchMessageException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; @@ -44,6 +43,7 @@ import org.briarproject.briar.api.messaging.PrivateMessageFormat; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java index a598ce718..921503b4e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java @@ -3,12 +3,12 @@ package org.briarproject.briar.messaging; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java index 6cefd59c0..44fb4f4ad 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.data.BdfReader; import org.briarproject.bramble.api.data.BdfReaderFactory; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.db.Metadata; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; @@ -17,6 +16,7 @@ import org.briarproject.bramble.api.sync.MessageContext; import org.briarproject.bramble.api.sync.validation.MessageValidator; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.attachment.CountingInputStream; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageFactoryImpl.java index a0033ace7..faeaeb05a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageFactoryImpl.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; 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.briar.api.privategroup.GroupMessage; import org.briarproject.briar.api.privategroup.GroupMessageFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageValidator.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageValidator.java index 0c1929112..02abed607 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/GroupMessageValidator.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; @@ -17,6 +16,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.ArrayList; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java index 864ad23ab..5c14b19cf 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java @@ -4,12 +4,12 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupFactory; import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.SecureRandom; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java index 0a8577ea9..3a5ca662a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java @@ -17,7 +17,6 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -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; @@ -40,6 +39,7 @@ import org.briarproject.briar.api.privategroup.Visibility; import org.briarproject.briar.api.privategroup.event.ContactRelationshipRevealedEvent; import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent; import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbortMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbortMessage.java index 23d69d074..bb74def43 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbortMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbortMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java index 779d008cf..26705cc01 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; @@ -29,6 +28,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java index c56601496..0f7036671 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; @@ -20,6 +19,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorSession.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorSession.java index f15215824..fad32f145 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorSession.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorState.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorState.java index 779618f6c..4bc332990 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorState.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorState.java @@ -1,8 +1,8 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/DeletableGroupInvitationMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/DeletableGroupInvitationMessage.java index 328180b3f..37c156bb6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/DeletableGroupInvitationMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/DeletableGroupInvitationMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationFactoryImpl.java index 9172e33f6..c9074563d 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationFactoryImpl.java @@ -7,10 +7,10 @@ import org.briarproject.bramble.api.contact.Contact; 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.Group; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java index 8e7804234..40d1733f9 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java @@ -16,7 +16,6 @@ import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; @@ -39,6 +38,7 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; import org.briarproject.briar.client.ConversationClientImpl; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationMessage.java index 9344d5213..05fa26642 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidator.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidator.java index 34111cf04..f04d38fa5 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidator.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; import org.briarproject.bramble.api.identity.Author; -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; @@ -17,6 +16,7 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; +import org.briarproject.nullsafety.NotNullByDefault; import java.security.GeneralSecurityException; import java.util.Collections; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteMessage.java index a9dc59329..e6817802c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.privategroup.invitation; 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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngine.java index e53d71162..6ce6d07c6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngine.java @@ -8,7 +8,6 @@ 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.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; @@ -23,6 +22,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.event.GroupInvitationRequestReceivedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeSession.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeSession.java index cade5865c..c7001f972 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeSession.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeState.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeState.java index e44990a89..c2e16a563 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeState.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeState.java @@ -1,8 +1,8 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/JoinMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/JoinMessage.java index 4b4c2b0eb..c3100a4c1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/JoinMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/JoinMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/LeaveMessage.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/LeaveMessage.java index a442ba894..e4cc60fd6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/LeaveMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/LeaveMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoder.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoder.java index 72e8b91d6..ca29c1312 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoder.java @@ -2,10 +2,10 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.data.BdfDictionary; 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.Message; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoderImpl.java index 2ef288951..c324eaf8c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageEncoderImpl.java @@ -5,11 +5,11 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; 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.Message; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageMetadata.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageMetadata.java index 51812f86d..5bc918641 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageMetadata.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageMetadata.java @@ -1,7 +1,7 @@ package org.briarproject.briar.privategroup.invitation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParser.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParser.java index 8300b305c..60e70e927 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParser.java @@ -5,10 +5,10 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; 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.nullsafety.NotNullByDefault; @NotNullByDefault interface MessageParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java index aac5ec988..244ac6853 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.data.BdfList; 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.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.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageType.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageType.java index 090d2e193..048e8164f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageType.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageType.java @@ -1,7 +1,7 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngine.java index 42a56ee18..10778a5dc 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngine.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; @@ -18,6 +17,7 @@ import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.privategroup.GroupMessageFactory; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerSession.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerSession.java index e0e1b56c0..99e2282f1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerSession.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerSession.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerState.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerState.java index ca7fd08e4..d74174331 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerState.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/PeerState.java @@ -1,8 +1,8 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngine.java index d44359d89..fd6924d7a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngine.java @@ -3,7 +3,7 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactory.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactory.java index 00ddc95b7..74a73388a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactory.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactory.java @@ -1,6 +1,6 @@ package org.briarproject.briar.privategroup.invitation; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface ProtocolEngineFactory { diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactoryImpl.java index b4c7c8bba..c770be7d7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/ProtocolEngineFactoryImpl.java @@ -3,7 +3,6 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.identity.IdentityManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.briar.api.autodelete.AutoDeleteManager; @@ -11,6 +10,7 @@ import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.privategroup.GroupMessageFactory; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Role.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Role.java index b79794276..c9d85bc22 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Role.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Role.java @@ -1,7 +1,7 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Session.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Session.java index 040ab401a..1baef4eed 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Session.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/Session.java @@ -1,8 +1,8 @@ package org.briarproject.briar.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.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoder.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoder.java index 876a53fea..60838c4a5 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoder.java @@ -1,7 +1,7 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionEncoder { diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoderImpl.java index 86fe5e3a0..b3b93fa5c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionEncoderImpl.java @@ -1,8 +1,8 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParser.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParser.java index b6d0b61b9..976c5e3df 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParser.java @@ -2,9 +2,9 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParserImpl.java index bbcd51493..a21c80273 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParserImpl.java @@ -3,10 +3,10 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/AbortMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/AbortMessage.java index 188c0b501..5832eb4a8 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/AbortMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/AbortMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/AcceptMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/AcceptMessage.java index 33644cb63..3c06f8500 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/AcceptMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/AcceptMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogMessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogMessageParserImpl.java index e111bcd15..01fe4e0d0 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogMessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogMessageParserImpl.java @@ -4,9 +4,9 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java index 47169b822..bcc1767ab 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; @@ -21,6 +20,7 @@ import org.briarproject.briar.api.blog.event.BlogInvitationRequestReceivedEvent; import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent; import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.conversation.ConversationRequest; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java index 26852845d..33311e5be 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java @@ -10,7 +10,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.IdentityManager; 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.versioning.ClientVersioningManager; import org.briarproject.briar.api.blog.Blog; @@ -19,6 +18,7 @@ import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogManager.RemoveBlogHook; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.client.MessageTracker; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingValidator.java b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingValidator.java index 1f64b02a3..cba2c0e6c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingValidator.java @@ -5,10 +5,10 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; 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.system.Clock; import org.briarproject.briar.api.blog.BlogFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/DeclineMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/DeclineMessage.java index e392ef701..0f63e7fe7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/DeclineMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/DeclineMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumMessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumMessageParserImpl.java index 76e5569ba..a9a45335d 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumMessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumMessageParserImpl.java @@ -3,9 +3,9 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java index 0342ee035..db53641d4 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; @@ -21,6 +20,7 @@ import org.briarproject.briar.api.forum.ForumManager; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent; import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingManagerImpl.java index 9b3cd97e1..27dc14529 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingManagerImpl.java @@ -6,7 +6,6 @@ import org.briarproject.bramble.api.data.MetadataParser; import org.briarproject.bramble.api.db.DatabaseComponent; 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.versioning.ClientVersioningManager; import org.briarproject.briar.api.client.MessageTracker; @@ -15,6 +14,7 @@ import org.briarproject.briar.api.forum.ForumInvitationResponse; import org.briarproject.briar.api.forum.ForumManager; import org.briarproject.briar.api.forum.ForumManager.RemoveForumHook; import org.briarproject.briar.api.forum.ForumSharingManager; +import org.briarproject.nullsafety.NotNullByDefault; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingValidator.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingValidator.java index dd66181d7..37acdd25e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingValidator.java @@ -4,11 +4,11 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumFactory; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/InviteMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/InviteMessage.java index d83a3a3f7..59f9eefcc 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/InviteMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/InviteMessage.java @@ -1,9 +1,9 @@ package org.briarproject.briar.sharing; -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.sharing.Shareable; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/LeaveMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/LeaveMessage.java index f51857055..d7e47b475 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/LeaveMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/LeaveMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoder.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoder.java index c64bdcafb..c0294c6e1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoder.java @@ -2,10 +2,10 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; -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 javax.annotation.Nullable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoderImpl.java index 05ef6bd65..51b5c5776 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageEncoderImpl.java @@ -4,11 +4,11 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; -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.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageMetadata.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageMetadata.java index 212d60810..fb505f89f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageMetadata.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageMetadata.java @@ -1,7 +1,7 @@ package org.briarproject.briar.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; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParser.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParser.java index e164dfdd8..b338a9f68 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParser.java @@ -5,11 +5,11 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; 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.sharing.Shareable; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface MessageParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java index bf832bc27..dd8768bcc 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java @@ -7,11 +7,11 @@ import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.data.BdfList; 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.sharing.Shareable; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageType.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageType.java index 1af500a74..bb96c5c10 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageType.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageType.java @@ -1,7 +1,7 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngine.java index 4f759fe0b..6ab15e8c1 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngine.java @@ -3,8 +3,8 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.sharing.Shareable; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java index b7c135365..172954b2a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.Event; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; @@ -23,6 +22,7 @@ import org.briarproject.briar.api.client.ProtocolStateException; import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.sharing.Shareable; import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.Map; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/Session.java b/briar-core/src/main/java/org/briarproject/briar/sharing/Session.java index 6e0a55201..e9f0c31ec 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/Session.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/Session.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoder.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoder.java index 61862e893..f8487b7c9 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoder.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoder.java @@ -1,7 +1,7 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionEncoder { diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoderImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoderImpl.java index 641731a4a..2453d0a93 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoderImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionEncoderImpl.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParser.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParser.java index 2467573b6..7eb84706b 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParser.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParser.java @@ -2,9 +2,9 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.nullsafety.NotNullByDefault; @NotNullByDefault interface SessionParser { diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParserImpl.java index 1c2eaa498..a29b25e0c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SessionParserImpl.java @@ -3,10 +3,10 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfEntry; -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; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java index 5ef16e12f..22473416f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java @@ -15,7 +15,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group.Visibility; @@ -36,6 +35,7 @@ import org.briarproject.briar.api.sharing.Shareable; import org.briarproject.briar.api.sharing.SharingInvitationItem; import org.briarproject.briar.api.sharing.SharingManager; import org.briarproject.briar.client.ConversationClientImpl; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.ArrayList; import java.util.Collection; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingMessage.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingMessage.java index 5d18579e0..5a5813569 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingMessage.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingMessage.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; -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; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingValidator.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingValidator.java index 4698ff0e2..e03af82d7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingValidator.java @@ -8,12 +8,12 @@ import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.MetadataEncoder; -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.bramble.api.system.Clock; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/State.java b/briar-core/src/main/java/org/briarproject/briar/sharing/State.java index 18defd671..4d8c47f78 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/State.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/State.java @@ -1,8 +1,8 @@ package org.briarproject.briar.sharing; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group.Visibility; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java index 474237ada..7bc6d4ec7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java @@ -13,7 +13,6 @@ import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BluetoothConstants; import org.briarproject.bramble.api.plugin.LanTcpConstants; import org.briarproject.bramble.api.plugin.TorConstants; @@ -40,6 +39,7 @@ import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.api.test.TestAvatarCreator; import org.briarproject.briar.api.test.TestDataCreator; +import org.briarproject.nullsafety.NotNullByDefault; import java.io.IOException; import java.io.InputStream; diff --git a/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java b/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java index 0a312c673..37c5775a2 100644 --- a/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java +++ b/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java @@ -1,6 +1,6 @@ package org.briarproject.briar.util; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import org.jsoup.Jsoup; import org.jsoup.safety.Safelist; diff --git a/briar-core/src/main/java/org/briarproject/briar/util/ValidationUtils.java b/briar-core/src/main/java/org/briarproject/briar/util/ValidationUtils.java index 58b8ddf6c..56f4f5a63 100644 --- a/briar-core/src/main/java/org/briarproject/briar/util/ValidationUtils.java +++ b/briar-core/src/main/java/org/briarproject/briar/util/ValidationUtils.java @@ -1,7 +1,7 @@ package org.briarproject.briar.util; import org.briarproject.bramble.api.FormatException; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java b/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java index f324990ac..f4973d12a 100644 --- a/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java @@ -1,9 +1,9 @@ package org.briarproject.briar.client; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageTree; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Test; import java.util.Arrays; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index dd980aa18..68ea90119 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -16,9 +16,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.identity.Author; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; @@ -36,6 +33,9 @@ import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent; import org.briarproject.briar.api.introduction.event.IntroductionResponseReceivedEvent; import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.junit.Before; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java index ba63b7bda..1c11bd79a 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; @@ -24,6 +23,7 @@ import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java index 173d3bebf..e3578248f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchGroupException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.blog.Blog; @@ -23,6 +22,7 @@ import org.briarproject.briar.api.conversation.ConversationResponse; import org.briarproject.briar.test.BriarIntegrationTest; import org.briarproject.briar.test.BriarIntegrationTestComponent; import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java index a93049018..50f288d1e 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; -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; @@ -30,6 +29,7 @@ import org.briarproject.briar.api.sharing.SharingInvitationItem; import org.briarproject.briar.test.BriarIntegrationTest; import org.briarproject.briar.test.BriarIntegrationTestComponent; import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; +import org.briarproject.nullsafety.NotNullByDefault; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java index 71830e597..220ba21f8 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java @@ -13,8 +13,6 @@ import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.test.BrambleIntegrationTest; @@ -28,6 +26,8 @@ import org.briarproject.briar.api.forum.ForumPostFactory; import org.briarproject.briar.api.privategroup.GroupMessageFactory; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory; +import org.briarproject.nullsafety.MethodsNotNullByDefault; +import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.junit.After; import org.junit.Before; diff --git a/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java b/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java index c4a52f701..f2d68331d 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java @@ -2,7 +2,7 @@ package org.briarproject.briar.test; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.nullsafety.NotNullByDefault; import java.util.concurrent.atomic.AtomicReference;