Commit 0ee74654 authored 6 years ago by Torsten Grote

Merge branch '41-alias-author-info' into 'master'

Refactor Author.Status into dedicated AuthorInfo class and add alias

See merge request !968

parents da3b2c15 7c202189

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/contact/ContactManager.java 11 additions, 0 deletions

.../org/briarproject/bramble/api/contact/ContactManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java 0 additions, 4 deletions

...in/java/org/briarproject/bramble/api/identity/Author.java
bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorInfo.java 52 additions, 0 deletions

...ava/org/briarproject/bramble/api/identity/AuthorInfo.java
bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java 0 additions, 11 deletions

...rg/briarproject/bramble/api/identity/IdentityManager.java
bramble-api/src/test/java/org/briarproject/bramble/api/identity/AuthorInfoTest.java 42 additions, 0 deletions

...org/briarproject/bramble/api/identity/AuthorInfoTest.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 30 additions, 1 deletion

.../org/briarproject/bramble/contact/ContactManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java 0 additions, 30 deletions

...rg/briarproject/bramble/identity/IdentityManagerImpl.java
bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java 92 additions, 2 deletions

.../briarproject/bramble/contact/ContactManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java 0 additions, 67 deletions

...riarproject/bramble/identity/IdentityManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/test/DbExpectations.java 8 additions, 0 deletions

...st/java/org/briarproject/bramble/test/DbExpectations.java
bramble-core/src/test/java/org/briarproject/bramble/test/RunTransactionWithResultAction.java 27 additions, 0 deletions

...rproject/bramble/test/RunTransactionWithResultAction.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java 5 additions, 3 deletions

...ava/org/briarproject/briar/android/blog/BlogPostItem.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java 3 additions, 3 deletions

...g/briarproject/briar/android/blog/BlogPostViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java 4 additions, 4 deletions

.../java/org/briarproject/briar/android/forum/ForumItem.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java 4 additions, 4 deletions

...r/android/privategroup/conversation/GroupMessageItem.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java 2 additions, 2 deletions

.../privategroup/conversation/JoinMessageItemViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java 7 additions, 2 deletions

...briar/android/privategroup/memberlist/MemberListItem.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java 9 additions, 7 deletions

...android/privategroup/memberlist/MemberListItemHolder.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java 1 addition, 1 deletion

...ject/briar/android/threaded/BaseThreadItemViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java 6 additions, 6 deletions

...a/org/briarproject/briar/android/threaded/ThreadItem.java

with 303 additions and 147 deletions

Please register or to comment