Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity
5,116 Commits 133 Branches 200 Tags
f76f9be4edb35473671e85f54cc1db7f647c8a5e
Commit Graph

1203 Commits

Author SHA1 Message Date
Torsten Grote
f76f9be4ed Reject attachments that exceed the allowed size 
Closes #1468
 2019-06-17 13:11:13 -03:00
Torsten Grote
6167ba5c46 [android] move unsent attachment cache logic into AttachmentController 2019-06-17 13:11:12 -03:00
Torsten Grote
55f4600a69 [android] Create attachments before showing previews 2019-06-17 13:11:12 -03:00
akwizgran
cd40e771d2 Allow messages to be marked as temporary. 2019-06-12 15:11:10 +01:00
Torsten Grote
1c56068bf1 Merge branch '1232-handshake-manager' into 'master' 
Implement handshake protocol

See merge request briar/briar!1118
 2019-06-04 11:49:11 +00:00
Torsten Grote
d2290e2037 Merge branch '1560-forum-sharing-integration-test' into 'master' 
Fix race conditions in ForumSharingIntegrationTest

Closes #1560

See merge request briar/briar!1119
 2019-06-04 11:47:49 +00:00
akwizgran
4ea8a4732c Fix race conditions in ForumSharingIntegrationTest. 2019-06-04 11:57:39 +01:00
akwizgran
89cbdc824c Add integration test for handshaking with pending contact. 2019-06-03 15:36:28 +01:00
akwizgran
85a1fd2caa Convert BriarIntegrationTest to use test reader and writer. 2019-06-03 15:34:59 +01:00
akwizgran
f8d240a320 Test stream reading and writing at a higher level. 2019-06-03 15:34:59 +01:00
akwizgran
d964f06de1 Use default methods for easier maintenance. 2019-06-03 15:34:16 +01:00
akwizgran
100e17b242 Use BrambleCoreModule in integration tests. 2019-06-03 15:34:16 +01:00
akwizgran
7bf86d9c53 Use real executors in integration tests. 2019-06-03 15:34:16 +01:00
Torsten Grote
8fc5c21354 Merge branch '1570-derive-handshake-root-key' into 'master' 
Add contact manager and key manager methods for converting a pending contact

Closes #1570

See merge request briar/briar!1114
 2019-06-03 14:33:21 +00:00
akwizgran
430b530ca5 Derive handshake root key when converting pending contact. 2019-05-30 17:27:07 +01:00
akwizgran
d0495b7c00 Wait for transport properties as well as client versions. 2019-05-30 13:55:16 +01:00
akwizgran
ee874947d0 Wait for message delivery in integration test. 2019-05-30 11:51:16 +01:00
akwizgran
14e604e21e Add 'verified' flag to ContactAddedEvent. 2019-05-27 11:40:28 +01: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
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
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
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
akwizgran
0b30a0786e Rename key manager methods for clarity. 2019-05-14 17:59:35 +01:00
akwizgran
7dc4dc566f Merge handshake and transport keys. 2019-05-14 17:57:19 +01:00
akwizgran
de8a60ea21 Use PublicKey and PrivateKey everywhere. 2019-05-14 17:26:26 +01:00
akwizgran
9c08073e49 Rename account to identity. 2019-05-10 10:02:49 +01:00
akwizgran
2cce0f5fe2 Remove OpenDatabaseHook priorities. 2019-05-10 10:02:48 +01:00
akwizgran
56fbc93962 Move handshake keys from LocalAuthor to Account. 2019-05-10 10:02:47 +01:00
akwizgran
f6611daf7b Replace Client interface with OpenDatabaseHook. 2019-05-10 10:02:45 +01:00
akwizgran
75776eb7de Generate handshake keys when creating local author. 2019-05-10 10:02:45 +01:00
Torsten Grote
66cdf4f595 Refactored IntroductionSucceededEvent into more generic ContactAddedRemotelyEvent 2019-05-03 09:48:18 -03:00
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
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
56fb20f257 Small code cleanups. 2019-04-18 13:47:31 +01:00
akwizgran
0587fdc54c Add handshake key pairs to DB, remove inactive contacts. 2019-04-18 13:15:25 +01:00
Torsten Grote
0e5bb3e9de [core] RSS blog posts are not local: re-enables notification 2019-04-17 20:32:09 -03:00
akwizgran
0f5f440f1c Add key set and key set ID classes for static keys. 2019-04-16 16:59:07 +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
d603607a90 Allow event executor tasks to be attached to transactions. 2019-04-05 15:57:20 +01:00
akwizgran
c3b5b04b71 Broadcast events asynchronously. 2019-04-05 15:00:49 +01:00
Torsten Grote
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
Torsten Grote
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
Torsten Grote
f9dfbe3fa5 Don't show remote introduction responses after declining locally 
Fixes #1514
 2019-03-26 16:18:11 -03:00
Torsten Grote
ce52a36db1 Display new contacts at the top of the contact list 
by initializing their latest message time with the current time
 2019-03-21 11:45:27 -03:00
Torsten Grote
ad71d69149 Create and use method in MessagingManager for checking for image support 2019-01-14 14:21:33 +00:00
Torsten Grote
3cfb04b60d Establish some rules for handling InputStreams 
* Methods shouldn't place any special requirements on the streams
  passed into them
* This implies that if a stream's going to be marked and reset,
  that should all happen within one method
* This also implies that if a method needs to mark and reset a stream,
  it should wrap the stream in a BufferedInputStream before doing so,
  rather than requiring a markable stream to be passed in
 2018-12-12 16:17:50 -02:00
Torsten Grote
80ee35d926 [core] Return fake mini PNG as Attachment instead of throwing exception 2018-12-12 16:17:50 -02:00