Merge branch 'introduction-ui-messages' into 'master' (e8f33c0e) · 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

e8f33c0e

Commit e8f33c0e authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'introduction-ui-messages' into 'master'

Fix introduction response messages in UI and some minor fixes

Closes #923

See merge request akwizgran/briar!776

parents 55a329a8 5f6af4e4

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java 3 additions, 0 deletions

.../briarproject/briar/android/contact/ConversationItem.java
briar-android/src/main/res/values/strings.xml 1 addition, 0 deletions

briar-android/src/main/res/values/strings.xml
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionManager.java 3 additions, 0 deletions

...arproject/briar/api/introduction/IntroductionManager.java
briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java 3 additions, 3 deletions

...iarproject/briar/introduction/AbstractProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java 1 addition, 1 deletion

...rproject/briar/introduction/IntroduceeProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java 28 additions, 8 deletions

...rproject/briar/introduction/IntroducerProtocolEngine.java
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java 174 additions, 8 deletions

...oject/briar/introduction/IntroductionIntegrationTest.java

with 213 additions and 20 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