Commit 6f0ab8b6 authored 6 years ago by akwizgran

Merge branch '1234-remote-contacts' into 'master'

Implement UX for adding contacts remotely

Closes #1234

See merge request !1035

parents df5ac59f dfc567cb

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

.../org/briarproject/bramble/api/contact/ContactManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedRemotelyEvent.java 3 additions, 3 deletions

.../bramble/api/contact/event/ContactAddedRemotelyEvent.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java 26 additions, 0 deletions

...bramble/api/contact/event/PendingContactRemovedEvent.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 5 additions, 17 deletions

.../org/briarproject/bramble/contact/ContactManagerImpl.java
briar-android/artwork/ic_nearby.svg 57 additions, 0 deletions

briar-android/artwork/ic_nearby.svg
briar-android/artwork/nickname.svg 176 additions, 0 deletions

briar-android/artwork/nickname.svg
briar-android/build.gradle 1 addition, 0 deletions

briar-android/build.gradle
briar-android/src/main/AndroidManifest.xml 26 additions, 0 deletions

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java 19 additions, 20 deletions

...project/briar/android/AndroidNotificationManagerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/NotificationCleanupService.java 3 additions, 3 deletions

...riarproject/briar/android/NotificationCleanupService.java
briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java 5 additions, 0 deletions

...java/org/briarproject/briar/android/TestingConstants.java
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 12 additions, 0 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java 6 additions, 11 deletions

...ava/org/briarproject/briar/android/blog/BlogFragment.java
briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java 5 additions, 11 deletions

...ava/org/briarproject/briar/android/blog/FeedFragment.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java 77 additions, 19 deletions

...iarproject/briar/android/contact/ContactListFragment.java
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java 105 additions, 0 deletions

.../briar/android/contact/add/remote/AddContactActivity.java
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java 112 additions, 0 deletions

...briar/android/contact/add/remote/AddContactViewModel.java
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java 164 additions, 0 deletions

...riar/android/contact/add/remote/LinkExchangeFragment.java
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java 121 additions, 0 deletions

...ct/briar/android/contact/add/remote/NicknameFragment.java
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java 105 additions, 0 deletions

...ndroid/contact/add/remote/PendingContactListActivity.java

with 1039 additions and 94 deletions

Please register or to comment