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

5c312b49

Commit 5c312b49 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1438-send-image-attachments' into 'master'

Store attachments and actually attach them to sent messages

Closes #1438

See merge request !1006

parents f56efe45 8c6dfaa1

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java 12 additions, 2 deletions

...ject/briar/android/conversation/AttachmentController.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java 9 additions, 55 deletions

...ject/briar/android/conversation/ConversationActivity.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java 149 additions, 1 deletion

...ect/briar/android/conversation/ConversationViewModel.java
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 20 additions, 2 deletions

...ain/java/org/briarproject/briar/android/util/UiUtils.java
briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java 3 additions, 2 deletions

...rg/briarproject/briar/api/messaging/MessagingManager.java
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java 11 additions, 3 deletions

...rg/briarproject/briar/messaging/MessagingManagerImpl.java

with 204 additions and 65 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