Torsten Grote
96975e0d43
Upgrade dagger, mockito and okhttp
2019-04-26 09:07:26 -03:00
Torsten Grote
6691e708e4
Update the Android gradle plugin to version 3.4.0
2019-04-25 20:55:30 -03:00
Torsten Grote
421c9c44d6
Merge branch 'bump-schema-version' into 'master'
...
Bump schema version to match migrations
See merge request briar/briar!1084
2019-04-23 14:41:18 +00:00
akwizgran
29d3ee2439
Bump schema version to match migrations.
2019-04-23 15:31:30 +01:00
akwizgran
06d4f85768
Merge branch 'add-handshake-key-pairs-to-db' into 'master'
...
Add handshake key pairs to DB, remove inactive contacts
Closes #1276
See merge request briar/briar!1080
2019-04-23 12:31:59 +00:00
Torsten Grote
9685462242
Merge branch 'static-transport-keys' into 'master'
...
Add database support for pending contacts and handshake keys
See merge request briar/briar!1078
2019-04-22 14:00:52 +00:00
akwizgran
84f2c29c76
Remove unnecessary call to replaceTypes().
2019-04-22 14:43:47 +01:00
akwizgran
9c8125d77a
Rename 'alice' flags to clarify usage, add comments.
2019-04-19 11:57:55 +01:00
akwizgran
1a1a010ee7
Update key derivation labels for handshake mode.
2019-04-19 11:36:21 +01:00
akwizgran
56fb20f257
Small code cleanups.
2019-04-18 13:47:31 +01:00
akwizgran
f82294527f
Fix column index in getLocalAuthor().
2019-04-18 13:35:42 +01:00
akwizgran
456f25b701
Revert unintended change to javadoc.
2019-04-18 13:31:00 +01:00
akwizgran
0587fdc54c
Add handshake key pairs to DB, remove inactive contacts.
2019-04-18 13:15:25 +01:00
akwizgran
ece083026e
Merge branch '1534-rss-notification' into 'master'
...
Make RSS blog posts not local: re-enables notification
Closes #1534
See merge request briar/briar!1079
2019-04-18 08:01:16 +00:00
Torsten Grote
0e5bb3e9de
[core] RSS blog posts are not local: re-enables notification
2019-04-17 20:32:09 -03:00
akwizgran
dcebd5a81c
Update terminology from static keys to handshake keys.
2019-04-17 17:28:22 +01:00
akwizgran
e9a3685bfd
Fix spurious line wrapping.
2019-04-17 17:22:49 +01:00
akwizgran
3aadcc17dd
Add public key to pending contacts.
2019-04-17 15:30:15 +01:00
akwizgran
296ce080e2
Add unit tests for pending contact exception.
2019-04-17 15:14:53 +01:00
akwizgran
724e6643bd
Add DB methods for handshake keys and pending contacts.
2019-04-17 15:07:58 +01:00
akwizgran
fafd0c7ff9
Rename static transport keys to handshake keys.
2019-04-17 14:52:52 +01:00
akwizgran
e91a7c64d8
Add unit tests for DB pending contact methods.
2019-04-17 13:06:41 +01:00
akwizgran
f08e3a58e6
Add database methods for pending contacts.
2019-04-17 12:44:43 +01:00
akwizgran
94de1834b8
Add unit tests for DB static key methods.
2019-04-17 12:06:47 +01:00
akwizgran
6b24eeb84c
Add method to set reordering window for static keys.
2019-04-17 09:58:36 +01:00
akwizgran
f72ff9f812
Add database methods for static keys.
2019-04-16 17:51:31 +01:00
akwizgran
0f5f440f1c
Add key set and key set ID classes for static keys.
2019-04-16 16:59:07 +01:00
akwizgran
7acbe56197
Add abstract superclass for transport keys.
2019-04-16 16:34:27 +01:00
akwizgran
fccf735a89
Add unit tests for static key derivation.
2019-04-16 16:34:27 +01:00
akwizgran
d5ac2c9ead
Fix master secret/master key/root key terminology.
...
In the key agreement, contact exchange and introduction protocols we
refer to the master key. In the transport protocol we refer to the root
key. When adding a contact in person, the key agreement protocol's
master key is used as the transport root key. When a contact is
introduced, the introduction protocol's master key is used as the
transport root key.
2019-04-16 16:34:26 +01:00
akwizgran
d4b929fc6c
Add key derivation for static keys.
2019-04-16 16:34:26 +01:00
akwizgran
b568405f59
Create DB tables for static keys.
2019-04-16 16:34:19 +01:00
Torsten Grote
ff2f710495
Merge branch 'crypto-api-code-cleanup' into 'master'
...
Minor code cleanups for crypto API
See merge request briar/briar!1076
2019-04-06 14:20:26 +00:00
Torsten Grote
d00094edab
Merge branch '1504-nokia-wake-lock' into 'master'
...
Use an appropriate wake lock tag for the device
Closes #1504
See merge request briar/briar!1077
2019-04-06 14:18:17 +00:00
akwizgran
9ca854473f
Use an appropriate wake lock tag for the device.
2019-04-06 10:38:27 +01:00
Torsten Grote
8603fd3257
Merge branch 'inject-dialog-fragments-early' into 'master'
...
Inject remaining fragments in onAttach()
See merge request briar/briar!1075
2019-04-05 16:43:27 +00:00
Torsten Grote
648fc6e65c
Merge branch 'async-events-refactoring' into 'master'
...
Refactor UI event listeners
See merge request briar/briar!1074
2019-04-05 16:41:19 +00:00
akwizgran
0c65e97fcf
Inject remaining fragments in onAttach().
2019-04-05 16:57:11 +01:00
akwizgran
16d2154c73
Add a couple of code cleanups.
2019-04-05 16:49:46 +01:00
akwizgran
b8e390db21
Refactor UI event listeners.
2019-04-05 16:36:54 +01:00
Torsten Grote
b2702062bc
Merge branch 'async-events-commit-actions' into 'master'
...
Allow actions to be attached to transactions
See merge request briar/briar!1073
2019-04-05 15:12:36 +00:00
akwizgran
f11b32f188
Add unit test for commit actions.
2019-04-05 16:02:37 +01:00
akwizgran
d603607a90
Allow event executor tasks to be attached to transactions.
2019-04-05 15:57:20 +01:00
Torsten Grote
6c0dffff56
Merge branch 'db-code-cleanup' into 'master'
...
Clean up some database code
See merge request briar/briar!1071
2019-04-05 14:38:54 +00:00
Torsten Grote
9f3394aa1d
Merge branch 'async-events' into 'master'
...
Broadcast events asynchronously
See merge request briar/briar!1072
2019-04-05 14:29:35 +00:00
akwizgran
74710664e3
Reduce scope of @SuppressWarnings.
2019-04-05 15:21:46 +01:00
akwizgran
0d0197fd2d
Construct EventBusImpl by injection.
2019-04-05 15:19:31 +01:00
akwizgran
c3b5b04b71
Broadcast events asynchronously.
2019-04-05 15:00:49 +01:00
akwizgran
8b3164e107
Merge branch '1529-request-buttons' into 'master'
...
Ensure that conversation request buttons always work
Closes #1529
See merge request briar/briar!1070
2019-04-05 12:55:26 +00:00
Torsten Grote
79ff5aa148
[android] ensure that conversation request buttons always work
2019-04-05 09:38:08 -03:00
