Commit 22f5c42f authored 6 years ago by akwizgran

Resolve merge conflicts.

# Conflicts:
#   briar-android/src/main/res/values/strings.xml

parents aab46040 18fd238a

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java 14 additions, 0 deletions

...va/org/briarproject/bramble/api/db/DatabaseComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Ack.java 6 additions, 0 deletions

.../src/main/java/org/briarproject/bramble/api/sync/Ack.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java 6 additions, 0 deletions

.../main/java/org/briarproject/bramble/api/sync/Message.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java 6 additions, 0 deletions

...rc/main/java/org/briarproject/bramble/api/sync/Offer.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordTypes.java 1 addition, 1 deletion

...n/java/org/briarproject/bramble/api/sync/RecordTypes.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java 6 additions, 0 deletions

.../main/java/org/briarproject/bramble/api/sync/Request.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java 14 additions, 0 deletions

...java/org/briarproject/bramble/api/sync/SyncConstants.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java 3 additions, 0 deletions

...a/org/briarproject/bramble/api/sync/SyncRecordReader.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java 2 additions, 0 deletions

...a/org/briarproject/bramble/api/sync/SyncRecordWriter.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Versions.java 26 additions, 0 deletions

...main/java/org/briarproject/bramble/api/sync/Versions.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java 34 additions, 0 deletions

...ject/bramble/api/sync/event/SyncVersionsUpdatedEvent.java
bramble-core/src/main/java/org/briarproject/bramble/db/Database.java 14 additions, 0 deletions

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

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

...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
bramble-core/src/main/java/org/briarproject/bramble/db/Migration45_46.java 1 addition, 2 deletions

...main/java/org/briarproject/bramble/db/Migration45_46.java
bramble-core/src/main/java/org/briarproject/bramble/db/Migration46_47.java 47 additions, 0 deletions

...main/java/org/briarproject/bramble/db/Migration46_47.java
bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java 6 additions, 1 deletion

.../org/briarproject/bramble/sync/DuplexOutgoingSession.java
bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java 29 additions, 1 deletion

...n/java/org/briarproject/bramble/sync/IncomingSession.java
bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java 6 additions, 1 deletion

...org/briarproject/bramble/sync/SimplexOutgoingSession.java
bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java 27 additions, 1 deletion

...a/org/briarproject/bramble/sync/SyncRecordReaderImpl.java

with 322 additions and 9 deletions

Please register or to comment