Merge branch '810-fix-sharing-status-screens' into 'master'
Fix Sharing Status screens * Remove distinction between "shared with" and "shared by" * Show all contacts a blog is shared with * Show online status of contacts in sharing screen  Closes #810 See merge request !445
No related branches found
No related tags found
Showing
- bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java 18 additions, 0 deletions.../org/briarproject/bramble/api/contact/ContactManager.java
- bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 27 additions, 0 deletions.../org/briarproject/bramble/contact/ContactManagerImpl.java
- briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java 20 additions, 12 deletions...est/java/org/briarproject/BlogSharingIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 6 additions, 6 deletions...st/java/org/briarproject/ForumSharingIntegrationTest.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java 14 additions, 0 deletions...a/org/briarproject/briar/android/contact/ContactItem.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java 14 additions, 2 deletions...rproject/briar/android/contact/ContactItemViewHolder.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItem.java 2 additions, 11 deletions...g/briarproject/briar/android/contact/ContactListItem.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java 0 additions, 10 deletions...ject/briar/android/contact/ContactListItemViewHolder.java
- briar-android/src/main/java/org/briarproject/briar/android/sharing/BlogSharingStatusActivity.java 5 additions, 7 deletions...ject/briar/android/sharing/BlogSharingStatusActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java 6 additions, 7 deletions...ect/briar/android/sharing/ForumSharingStatusActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java 29 additions, 60 deletions...rproject/briar/android/sharing/SharingStatusActivity.java
- briar-android/src/main/res/layout/activity_sharing_status.xml 0 additions, 48 deletions...r-android/src/main/res/layout/activity_sharing_status.xml
- briar-android/src/main/res/layout/list_item_contact_small.xml 16 additions, 6 deletions...r-android/src/main/res/layout/list_item_contact_small.xml
- briar-android/src/main/res/values/strings.xml 0 additions, 2 deletionsbriar-android/src/main/res/values/strings.xml
- briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingManager.java 0 additions, 5 deletions...va/org/briarproject/briar/api/sharing/SharingManager.java
- briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java 27 additions, 1 deletion...rg/briarproject/briar/sharing/BlogSharingManagerImpl.java
- briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java 2 additions, 28 deletions...va/org/briarproject/briar/sharing/SharingManagerImpl.java
- briar-tests/src/org/briarproject/bramble/contact/ContactManagerImplTest.java 48 additions, 8 deletions.../briarproject/bramble/contact/ContactManagerImplTest.java
Loading
Please register or sign in to comment