Merge branch '893-double-introduction-accept' into 'master' (a1e65c9f) · 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

a1e65c9f

Commit a1e65c9f authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '893-double-introduction-accept' into 'master'

Prevent conversation actions from being executed twice

Closes #893

See merge request !512

parents fe963edd 499d2fe6

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java 1 addition, 0 deletions

...arproject/briar/android/contact/ConversationActivity.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java 6 additions, 1 deletion

...roject/briar/android/contact/ConversationRequestItem.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java 4 additions, 0 deletions

.../briar/android/contact/ConversationRequestViewHolder.java

with 11 additions and 1 deletion

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