Merge branch '237-versioning-client' into 'master' (edee90db) · Commits · Julian Dehm / briar

Commit edee90db authored 6 years ago by Torsten Grote

Merge branch '237-versioning-client' into 'master'

Client for negotiating supported clients

Closes #237

See merge request akwizgran/briar!759

parents c42852cd fd78139a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java 3 additions, 3 deletions

.../briarproject/bramble/api/client/ContactGroupFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java 10 additions, 1 deletion

...va/org/briarproject/bramble/api/db/DatabaseComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java 6 additions, 3 deletions

.../briarproject/bramble/api/lifecycle/LifecycleManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java 10 additions, 5 deletions

...ject/bramble/api/properties/TransportPropertyManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Group.java 29 additions, 4 deletions

...rc/main/java/org/briarproject/bramble/api/sync/Group.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java 2 additions, 2 deletions

.../java/org/briarproject/bramble/api/sync/GroupFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java 3 additions, 1 deletion

...java/org/briarproject/bramble/api/sync/SyncConstants.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/ValidationManager.java 11 additions, 5 deletions

.../org/briarproject/bramble/api/sync/ValidationManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java 50 additions, 0 deletions

...iarproject/bramble/api/versioning/ClientMajorVersion.java
bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java 45 additions, 0 deletions

...oject/bramble/api/versioning/ClientVersioningManager.java
bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java 5 additions, 4 deletions

...rc/test/java/org/briarproject/bramble/test/TestUtils.java
bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java 5 additions, 2 deletions

.../org/briarproject/bramble/BrambleCoreEagerSingletons.java
bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java 7 additions, 2 deletions

...main/java/org/briarproject/bramble/BrambleCoreModule.java
bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java 6 additions, 6 deletions

.../briarproject/bramble/client/ContactGroupFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoExecutorModule.java 67 additions, 0 deletions

...org/briarproject/bramble/crypto/CryptoExecutorModule.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java 0 additions, 55 deletions

...in/java/org/briarproject/bramble/crypto/CryptoModule.java
bramble-core/src/main/java/org/briarproject/bramble/db/Database.java 2 additions, 1 deletion

...e/src/main/java/org/briarproject/bramble/db/Database.java
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java 12 additions, 3 deletions

...va/org/briarproject/bramble/db/DatabaseComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java 21 additions, 16 deletions

...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
bramble-core/src/main/java/org/briarproject/bramble/properties/PropertiesModule.java 9 additions, 2 deletions

...org/briarproject/bramble/properties/PropertiesModule.java

with 303 additions and 115 deletions

Please register or to comment