akwizgran
4e523c5fbc
Merge branch '1242-display-image-attachments' into 'master'
...
[android] refactor conversation items and view holders
See merge request briar/briar!984
2018-11-08 16:08:58 +00:00
akwizgran
3bfa5e2081
[android] Move ConversationListener to top level.
2018-11-08 10:27:36 -02:00
akwizgran
f2b09deac4
[android] Remove type parameter from view holders.
2018-11-08 10:27:29 -02:00
Torsten Grote
ad4729b2f9
[android] refactor conversation items and view holders
...
This is a preparation for image support.
2018-11-08 10:27:29 -02:00
akwizgran
50cc0a6815
Merge branch '1452-websocket-authentication' into 'master'
...
[headless] change websocket authentication from basic auth to token message
Closes #1452
See merge request briar/briar!986
2018-11-08 12:26:53 +00:00
Torsten Grote
32c8ac6576
[headless] change websocket authentication from basic auth to token message
2018-11-08 10:15:17 -02:00
akwizgran
c12422d949
Merge branch '1434-android-conversation-package' into 'master'
...
Move conversation classes into their own package
See merge request briar/briar!978
2018-11-08 11:01:36 +00:00
akwizgran
3841713c18
Merge branch 'upgrade_roboletric_to_401' into 'master'
...
Upgrade robolectric to 4.0.1
See merge request briar/briar!980
2018-11-08 11:00:08 +00:00
akwizgran
79232eb558
Merge branch 'headless-fixes' into 'master'
...
Headless fixes
See merge request briar/briar!985
2018-11-08 10:55:28 +00:00
Torsten Grote
d02b30e751
Merge branch 'use-transactional-db-api' into 'master'
...
Use transactional database API in Bramble
See merge request briar/briar!974
2018-11-07 19:06:26 +00:00
akwizgran
043662a092
Code cleanup.
2018-11-07 18:31:07 +00:00
Torsten Grote
efc85fb88f
[headless] don't use putAll for a single field
2018-11-07 15:24:20 -03:00
Torsten Grote
8b3983ef9e
[headless] only offload to DatabaseExecutor when needed
...
when receiving a new conversation message
2018-11-07 15:24:20 -03:00
Torsten Grote
6766fb76b2
[headless] upgrade javalin and mockk
2018-11-07 15:18:46 -03:00
Torsten Grote
7f74bd1c38
[headless] Use --user for websocket example request
...
The authentication token can contain slashes.
When used as part of the URL, the URL becomes invalid.
Therefore, using curl's user parameter is preferrable.
2018-11-07 15:18:46 -03:00
akwizgran
951ee30b95
Update tests.
2018-11-07 18:18:30 +00:00
akwizgran
c386a0f5eb
Replace Maybe with nullable transaction method.
2018-11-07 18:18:30 +00:00
akwizgran
52c778dce3
Reformat code.
2018-11-07 18:18:27 +00:00
akwizgran
e846a13f50
Use transactional database API in Bramble.
2018-11-07 18:14:10 +00:00
akwizgran
23e9b119d1
Merge branch '1434-message-attachments' into 'master'
...
Add attachment API for sending/retreiving private messages
See merge request briar/briar!976
2018-11-07 18:08:36 +00:00
akwizgran
e6f380296f
Merge branch '1451-briar-headless-test-other-modules' into 'master'
...
[headless] Limit tests in Android Studio to headless package
Closes #1451
See merge request briar/briar!983
2018-11-07 17:47:37 +00:00
Torsten Grote
794fb9686b
[headless] Limit tests in Android Studio to headless package
2018-11-07 13:46:49 -03:00
Torsten Grote
bb22b9db10
Merge branch 'remove-hamcrest-dependencies' into 'master'
...
Remove redundant dependency declarations
See merge request briar/briar!981
2018-11-07 16:37:30 +00:00
Julian Dehm
d4f015d054
Upgrade robolectric to 4.0.1
2018-11-07 17:11:21 +01:00
akwizgran
41e5d8900c
Remove redundant dependency declarations.
2018-11-07 16:10:39 +00:00
Torsten Grote
c3cb966009
[android] move conversation classes into their own package
2018-11-07 11:48:20 -03:00
Torsten Grote
f964d1ef07
Fix receivers of ConversationMessageReceivedEvent
...
These were only listening to private message events, ignoring all others
2018-11-07 11:34:11 -03:00
Torsten Grote
cccaeeda6c
[core] Add API to add messages with attachments
2018-11-07 11:34:11 -03:00
Torsten Grote
483106e00c
[core] Add MessagingManager#getAttachment()
2018-11-07 11:34:11 -03:00
Torsten Grote
934f14ef31
[core] Add attachment support to private messages
2018-11-07 11:34:09 -03:00
Torsten Grote
e3abff5ad8
Refactor PrivateMessageHeader to ConversationMessageHeader base-class
...
This is preparation for adding attachments to private messages
2018-11-07 11:33:37 -03:00
Torsten Grote
391732b239
Merge branch 'change-contact-name' into 'master'
...
Change button text to match name of action
See merge request briar/briar!979
2018-11-07 12:11:22 +00:00
akwizgran
4738bfdd85
Ignore missing translations.
2018-11-07 10:43:13 +00:00
akwizgran
be1ca89309
Change button text to match name of action.
2018-11-07 10:40:59 +00:00
Torsten Grote
866be99179
Merge branch '41-alias-frontend' into 'master'
...
Add UI for changing contact aliases
Closes #41
See merge request briar/briar!965
2018-11-06 18:09:47 +00:00
akwizgran
48822e2133
Merge branch '1381-introduction-test-fails' into 'master'
...
Fix non-determinism of Introduction integration tests
Closes #1381
See merge request briar/briar!970
2018-11-06 18:00:48 +00:00
Torsten Grote
6883c5caa9
[android] address last contact aliases review issues
2018-11-06 14:57:39 -03:00
Torsten Grote
8b709969ab
[android] pass ContactId via ViewModel to AliasDialogFragment
2018-11-06 13:42:51 -03:00
Torsten Grote
fe94b65b3b
[android] Fix double loading of conversation messages when rotating screen
2018-11-06 13:42:51 -03:00
akwizgran
f54df1d787
Reduce visibility, remove unnecessary rethrow.
2018-11-06 13:42:51 -03:00
akwizgran
a7e826ccf5
Remove qualification from java.lang.Runnable.
2018-11-06 13:42:51 -03:00
akwizgran
845eb3262b
Use expression lambda.
2018-11-06 13:42:51 -03:00
akwizgran
0a46ad439f
Check whether activity is null.
2018-11-06 13:42:51 -03:00
akwizgran
d14d93ea35
Require observed data to be non-null.
2018-11-06 13:42:51 -03:00
akwizgran
12a1cf8f8b
Reuse Observer interface.
2018-11-06 13:42:51 -03:00
akwizgran
fb2ab861db
Fix some lint warnings.
2018-11-06 13:42:51 -03:00
Torsten Grote
aa15b68d24
[android] Reload conversation when contact name changes
2018-11-06 13:42:51 -03:00
Torsten Grote
7059f376f1
[android] Add UI for changing contact alias
...
This introduces the first ViewModel to share state between the
ConversationActivity and the AliasDialogFragment.
2018-11-06 13:42:51 -03:00
akwizgran
9313c191c1
Merge branch 'ui-fixes' into 'master'
...
Small UI fixes
See merge request briar/briar!975
2018-11-05 10:40:09 +00:00
akwizgran
7746364ae9
Merge branch '1437-reversed-emoji' into 'master'
...
[android] Add new emojis to the beginning of the list of recently used ones
Closes #1437
See merge request briar/briar!977
2018-11-05 10:27:03 +00:00
