dcebd5a81c
Update terminology from static keys to handshake keys.
2019-04-17 17:28:22 +01:00
e9a3685bfd
Fix spurious line wrapping.
2019-04-17 17:22:49 +01:00
3aadcc17dd
Add public key to pending contacts.
2019-04-17 15:30:15 +01:00
296ce080e2
Add unit tests for pending contact exception.
2019-04-17 15:14:53 +01:00
724e6643bd
Add DB methods for handshake keys and pending contacts.
2019-04-17 15:07:58 +01:00
fafd0c7ff9
Rename static transport keys to handshake keys.
2019-04-17 14:52:52 +01:00
e91a7c64d8
Add unit tests for DB pending contact methods.
2019-04-17 13:06:41 +01:00
f08e3a58e6
Add database methods for pending contacts.
2019-04-17 12:44:43 +01:00
94de1834b8
Add unit tests for DB static key methods.
2019-04-17 12:06:47 +01:00
6b24eeb84c
Add method to set reordering window for static keys.
2019-04-17 09:58:36 +01:00
f72ff9f812
Add database methods for static keys.
2019-04-16 17:51:31 +01:00
0f5f440f1c
Add key set and key set ID classes for static keys.
2019-04-16 16:59:07 +01:00
7acbe56197
Add abstract superclass for transport keys.
2019-04-16 16:34:27 +01:00
fccf735a89
Add unit tests for static key derivation.
2019-04-16 16:34:27 +01:00
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
d4b929fc6c
Add key derivation for static keys.
2019-04-16 16:34:26 +01:00
b568405f59
Create DB tables for static keys.
2019-04-16 16:34:19 +01:00
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
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
9ca854473f
Use an appropriate wake lock tag for the device.
2019-04-06 10:38:27 +01:00
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
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
0c65e97fcf
Inject remaining fragments in onAttach().
2019-04-05 16:57:11 +01:00
16d2154c73
Add a couple of code cleanups.
2019-04-05 16:49:46 +01:00
b8e390db21
Refactor UI event listeners.
2019-04-05 16:36:54 +01:00
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
f11b32f188
Add unit test for commit actions.
2019-04-05 16:02:37 +01:00
d603607a90
Allow event executor tasks to be attached to transactions.
2019-04-05 15:57:20 +01:00
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
9f3394aa1d
Merge branch 'async-events' into 'master'
...
Broadcast events asynchronously
See merge request briar/briar!1072
2019-04-05 14:29:35 +00:00
74710664e3
Reduce scope of @SuppressWarnings.
2019-04-05 15:21:46 +01:00
0d0197fd2d
Construct EventBusImpl by injection.
2019-04-05 15:19:31 +01:00
c3b5b04b71
Broadcast events asynchronously.
2019-04-05 15:00:49 +01:00
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
79ff5aa148
[android] ensure that conversation request buttons always work
2019-04-05 09:38:08 -03:00
652ce4a53d
Merge branch '1514-introduction-message' into 'master'
...
Fix Introduction Issues
Closes #1516 and #1514
See merge request briar/briar!1067
2019-04-04 16:47:09 +00:00
df0d6594b6
Merge branch '1522-contact-alias-length' into 'master'
...
Check contact alias for maximum length in UI
Closes #1522
See merge request briar/briar!1069
2019-04-03 10:17:54 +00:00
f73ecc6066
[android] Check contact alias for maximum length before proceeding
2019-04-02 15:06:32 -03:00
0f614e8460
Merge branch '1492-send-after-previews-loaded' into 'master'
...
Show progress bar while image previews are loading
Closes #1510 , #1509 , and #1492
See merge request briar/briar!1033
2019-04-01 10:27:38 +00:00
f4bdd201a3
[android] fix bug where onboarding is shown again when activity resumes
2019-03-28 08:45:43 -03:00
5130c83556
[android] Show progress bar while image previews are loading
...
This refactors the send buttons out into their own composite view
2019-03-28 08:45:43 -03:00
423ecc003b
[android] Get notified when all image previews have been loaded
...
Also fix crash when attaching image fails
2019-03-28 08:45:43 -03:00
419f37a4a9
Merge branch '1517-scroll-listener-npe' into 'master'
...
Don't try to get item at NO_POSITION
Closes #1517
See merge request briar/briar!1068
2019-03-28 11:30:42 +00:00
3d94ffb714
Don't try to get item at NO_POSITION.
2019-03-28 11:06:13 +00:00
d40cfd30a2
Let IntroductionResponse know if introduction can succeed
...
and use this information in the android UI for showing that the user
needs to wait or not.
2019-03-26 16:18:25 -03:00
3b4a92f66c
Fix introduction after one was declined
...
When we received a remote decline we always went into the REMOTE_DECLINED state
while there's two cases where we need to go into the START state instead.
So when the new request arrived, we weren't in START and thus aborted the protocol.
This commit fixes this.
Fixes #1516
2019-03-26 16:18:25 -03:00
f9dfbe3fa5
Don't show remote introduction responses after declining locally
...
Fixes #1514
2019-03-26 16:18:11 -03:00
bc8bb08853
Merge branch '1488-do-not-witness-aapt' into 'master'
...
Exclude AAPT dependency from gradle-witness
See merge request briar/briar!1066
2019-03-26 17:19:40 +00:00
cc67a8fcdd
Exclude AAPT dependency from gradle-witness.
2019-03-26 17:06:46 +00:00
f8cf88e6cd
Merge branch '1421-contact-list-during-migration' into 'master'
...
Don't start BriarActivities when lifecycle did not start
Closes #1421
See merge request briar/briar!1058
2019-03-26 14:25:10 +00:00
akwizgran
Torsten Grote