Merge branch '284-force-introduction-decline-when-identities' into 'master'
Addresses two Introduction Corner Cases * force decline when two of our own identities are introduced to each other * throw away introduction requests to the same identity (impossible to trigger from UI) Closes #284 Closes #294 See merge request !143
No related branches found
No related tags found
Showing
- briar-android/res/layout/list_item_introduction_in.xml 2 additions, 2 deletionsbriar-android/res/layout/list_item_introduction_in.xml
- briar-android/res/values/strings.xml 1 addition, 0 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/contact/ConversationAdapter.java 17 additions, 9 deletions...org/briarproject/android/contact/ConversationAdapter.java
- briar-api/src/org/briarproject/api/db/DatabaseComponent.java 6 additions, 0 deletionsbriar-api/src/org/briarproject/api/db/DatabaseComponent.java
- briar-api/src/org/briarproject/api/introduction/IntroductionConstants.java 1 addition, 0 deletions.../briarproject/api/introduction/IntroductionConstants.java
- briar-api/src/org/briarproject/api/introduction/IntroductionRequest.java 6 additions, 2 deletions...rg/briarproject/api/introduction/IntroductionRequest.java
- briar-core/src/org/briarproject/db/DatabaseComponentImpl.java 7 additions, 0 deletions...r-core/src/org/briarproject/db/DatabaseComponentImpl.java
- briar-core/src/org/briarproject/introduction/IntroduceeEngine.java 4 additions, 1 deletion...e/src/org/briarproject/introduction/IntroduceeEngine.java
- briar-core/src/org/briarproject/introduction/IntroduceeManager.java 12 additions, 0 deletions.../src/org/briarproject/introduction/IntroduceeManager.java
- briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java 10 additions, 3 deletions...rg/briarproject/introduction/IntroductionManagerImpl.java
- briar-tests/src/org/briarproject/introduction/IntroduceeManagerTest.java 6 additions, 0 deletions.../org/briarproject/introduction/IntroduceeManagerTest.java
Loading
Please register or sign in to comment