akwizgran
|
eca82e2888
|
Merge branch '1554-remove-pending-contacts' into 'master'
Allow pending contacts to be removed at any time
Closes #1554
See merge request briar/briar!1098
|
2019-05-24 14:49:48 +00:00 |
|
Torsten Grote
|
ad93100e99
|
Merge branch '35-transaction-manager' into 'master'
Extract TransactionManager from DatabaseComponent
See merge request briar/briar!1104
|
2019-05-24 13:20:35 +00:00 |
|
akwizgran
|
a6376af7c2
|
Extract TransactionManager from DatabaseComponent.
|
2019-05-24 12:44:23 +01:00 |
|
Torsten Grote
|
9ce71088e2
|
Merge branch '1564-rendezvous-plugin-api' into 'master'
Add rendezvous API to transport plugins
See merge request briar/briar!1103
|
2019-05-22 16:58:31 +00:00 |
|
Torsten Grote
|
0f3e6d9736
|
Merge branch '1567-remove-pending-contact-state-from-db' into 'master'
Remove pending contact state from DB
See merge request briar/briar!1102
|
2019-05-22 16:56:59 +00:00 |
|
akwizgran
|
de97cce119
|
Address review comments.
|
2019-05-22 17:46:17 +01:00 |
|
akwizgran
|
a82d20564a
|
Update names in RendezvousModule.
|
2019-05-22 16:13:49 +01:00 |
|
akwizgran
|
967f068637
|
Add initial API for rendezvous plugins.
|
2019-05-22 15:26:28 +01:00 |
|
akwizgran
|
90c33133c3
|
Code cleanup.
|
2019-05-22 15:22:35 +01:00 |
|
akwizgran
|
01ef367864
|
Remove pending contact state from the database.
|
2019-05-22 11:25:05 +01:00 |
|
Torsten Grote
|
da5d442c91
|
Merge branch '1232-poller-refactoring' into 'master'
Pass a connection handler to plugins when polling
See merge request briar/briar!1101
|
2019-05-21 13:33:53 +00:00 |
|
akwizgran
|
ead7570ec5
|
Add javadoc.
|
2019-05-21 14:27:27 +01:00 |
|
akwizgran
|
43b2f9da1c
|
Static import.
|
2019-05-17 15:46:37 +01:00 |
|
akwizgran
|
668433dd62
|
Pass a connection handler to plugins when polling.
|
2019-05-17 14:07:54 +01:00 |
|
akwizgran
|
a0772852de
|
Decouple poller from plugin manager.
|
2019-05-17 13:59:30 +01:00 |
|
akwizgran
|
99000d8eab
|
Merge branch 'repro-check-on-success' into 'master'
Only check reproducibility when normal tests pass
See merge request briar/briar!1100
|
2019-05-16 16:58:33 +00:00 |
|
Torsten Grote
|
0b48afb692
|
Only check reproducibility when normal tests pass
|
2019-05-16 13:48:25 -03:00 |
|
Torsten Grote
|
299ad07222
|
[android] Allow pending contacts to be removed at any time
|
2019-05-16 12:54:42 -03:00 |
|
akwizgran
|
37d0b61d7b
|
Bump version numbers for 1.1.7 release.
release-1.1.7
beta-1.1.7
|
2019-05-16 16:07:15 +01:00 |
|
akwizgran
|
98a1ec89d7
|
Update translations.
|
2019-05-16 16:06:29 +01:00 |
|
akwizgran
|
a61860af85
|
Merge branch '1369-thread-layout' into 'master'
Adapt private group join notices to new threaded layout
Closes #1369
See merge request briar/briar!1097
|
2019-05-16 14:54:46 +00:00 |
|
Torsten Grote
|
90437f4fa4
|
[android] use same color for thread dividers than indentation dividers
|
2019-05-16 11:35:20 -03:00 |
|
Torsten Grote
|
06212453b2
|
[android] Adapt private group join notices to new threaded layout
|
2019-05-16 11:12:48 -03:00 |
|
akwizgran
|
ddc9b5b066
|
Merge branch '1256-adding-contacts-headless' into 'master'
Add a REST endpoint for adding contacts
Closes #1256
See merge request briar/briar!1094
|
2019-05-16 14:05:48 +00:00 |
|
Torsten Grote
|
0aa6166afa
|
Merge branch 'account-logging' into 'master'
Log contents of account directory for debugging
See merge request briar/briar!1096
|
2019-05-16 11:51:46 +00:00 |
|
akwizgran
|
60b91bc317
|
Log contents of account directory for debugging.
|
2019-05-16 10:06:16 +01:00 |
|
akwizgran
|
20481a3790
|
Merge branch '1369-thread-layout' into 'master'
Move AuthorView up in threaded conversation
Closes #1369
See merge request briar/briar!1095
|
2019-05-16 08:46:39 +00:00 |
|
Torsten Grote
|
576934910e
|
Merge branch '1566-equivalent-public-keys' into 'master'
Add tests for equivalent handshake public keys
See merge request briar/briar!1093
|
2019-05-15 20:02:52 +00:00 |
|
Torsten Grote
|
4abc26093e
|
Merge branch '1556-key-manager-methods-for-pending-contacts' into 'master'
Add key manager methods for pending contacts
Closes #1556
See merge request briar/briar!1089
|
2019-05-15 19:57:32 +00:00 |
|
Torsten Grote
|
aed63746e7
|
[android] Move AuthorView up in threaded conversation
|
2019-05-15 16:33:06 -03:00 |
|
Torsten Grote
|
816598b631
|
[headless] only include alias in contact's JSON representation if it exists
|
2019-05-15 16:03:02 -03:00 |
|
Torsten Grote
|
c062c16d27
|
Merge branch 'merge-handshake-and-transport-keys' into 'master'
Add support for handshake keys to KeyManager
See merge request briar/briar!1088
|
2019-05-15 16:27:33 +00:00 |
|
Torsten Grote
|
435b43488a
|
[headless] address review comments for remote contact adding
|
2019-05-15 12:36:33 -03:00 |
|
Torsten Grote
|
faa6a85148
|
[headless] Add tests to ensure that remote contact adding needs auth token
|
2019-05-15 11:28:01 -03:00 |
|
Torsten Grote
|
3770a9f217
|
[headless] make events related to adding contacts available via websocket
|
2019-05-15 11:28:01 -03:00 |
|
Torsten Grote
|
c6211be488
|
[bramble-core] Broadcast events when pending contacts are added or removed
|
2019-05-15 11:27:59 -03:00 |
|
Torsten Grote
|
5a73e50248
|
[headless] expose ContactManager methods for adding contacts remotely
|
2019-05-15 11:26:21 -03:00 |
|
Torsten Grote
|
dc6971734a
|
[briar-core] Add a getRealHandshakeLink() method to BriarTestUtils
Also allow testOutput from briar-core to be used in briar-headless
|
2019-05-15 11:26:20 -03:00 |
|
Torsten Grote
|
69e57bee61
|
[bramble] Let TestUtils return a PendingContact with random state
|
2019-05-15 11:26:19 -03:00 |
|
Torsten Grote
|
af8cabbb28
|
[headless] update dependencies
|
2019-05-15 11:25:11 -03:00 |
|
akwizgran
|
6f31a3c2ad
|
Merge branch 'key-pair-refactoring' into 'master'
Key pair refactoring
See merge request briar/briar!1083
|
2019-05-15 14:19:48 +00:00 |
|
akwizgran
|
d3469e3782
|
Merge branch '1482-startup-activity' into 'master'
Combine Password and OpenDatabase Activity into StartupActivity
Closes #1482
See merge request briar/briar!1087
|
2019-05-15 09:57:01 +00:00 |
|
akwizgran
|
9d64b186ff
|
Add tests for hashing public keys into shared secret.
|
2019-05-15 10:18:13 +01:00 |
|
akwizgran
|
ca591b5c7b
|
Add test for equivalent public keys.
|
2019-05-15 10:18:09 +01:00 |
|
akwizgran
|
2c4188caf5
|
Use lambdas for tasks requiring a manager lookup.
|
2019-05-14 17:59:35 +01:00 |
|
akwizgran
|
0b30a0786e
|
Rename key manager methods for clarity.
|
2019-05-14 17:59:35 +01:00 |
|
akwizgran
|
f9b928c12a
|
Annotate equals() argument as nullable.
|
2019-05-14 17:59:35 +01:00 |
|
akwizgran
|
afa0b96293
|
Add utility method for null checks.
|
2019-05-14 17:59:34 +01:00 |
|
akwizgran
|
dd50f4bcd4
|
Add key manager methods for pending contacts.
|
2019-05-14 17:59:34 +01:00 |
|
akwizgran
|
f42fc5213e
|
Add key manager method for contacts with handshake keys.
|
2019-05-14 17:59:34 +01:00 |
|