Merge branch '798-remove-contact-blogs' into 'master' (aee65a71) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

aee65a71

Commit aee65a71 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '798-remove-contact-blogs' into 'master'

Allow to remove pre-shared blogs of our contacts

Closes #798

See merge request !529

parents 3c1ea81c 6a07d8f2

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java 1 addition, 1 deletion

...g/briarproject/briar/android/blog/BlogControllerImpl.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogManager.java 1 addition, 1 deletion

...ain/java/org/briarproject/briar/api/blog/BlogManager.java
briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java 8 additions, 22 deletions

...ain/java/org/briarproject/briar/blog/BlogManagerImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java 12 additions, 13 deletions

...rg/briarproject/briar/sharing/BlogSharingManagerImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java 12 additions, 1 deletion

...va/org/briarproject/briar/sharing/SharingManagerImpl.java
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java 12 additions, 43 deletions

...java/org/briarproject/briar/blog/BlogManagerImplTest.java
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java 8 additions, 9 deletions

...g/briarproject/briar/blog/BlogManagerIntegrationTest.java
briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java 22 additions, 33 deletions

...riarproject/briar/sharing/BlogSharingIntegrationTest.java

with 76 additions and 123 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment