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

bab9a419

Commit bab9a419 authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '97-show-connection-status-of-contact-in-conversation-view' into 'master'

Show connection status of contact in conversation view



See merge request !24

parents 2621ab01 327073f5

Loading

Checking pipeline status

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/layout/activity_conversation.xml 63 additions, 0 deletions

briar-android/res/layout/activity_conversation.xml
briar-android/res/values/strings.xml 3 additions, 0 deletions

briar-android/res/values/strings.xml
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 79 additions, 100 deletions

...rg/briarproject/android/contact/ConversationActivity.java

with 145 additions and 100 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