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

5075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torsten Grote
dc2e42e1f2 [android] don't check getIntent() for null as it should be non-null now 2019-06-10 07:39:49 -03:00
Torsten Grote
1c4d277771 Don't route intents for MANAGE_NETWORK_USAGE settings 
This is because we require a special permission to launch this intent
and we prefer requiring this permission to having the NavDrawerActivity
added to the back stack.

This commit also re-adds the deprecated USE_FINGERPRINT permission as
Android Studio would show an error otherwise.
 2019-06-10 07:39:48 -03:00
Torsten Grote
fb10ba5855 [android] Receive external intents through NavDrawerActivity 
This ensures that our main activity is on the task stack below the
activity opened by an external intent. So when the user navigates back,
they always get back to the main activity.
 2019-06-10 07:39:48 -03:00
Torsten Grote
f31b85acdb Merge branch '1564-tor-rendezvous-crypto' into 'master' 
Publish hidden service for connecting to pending contact

Closes #1564

See merge request briar/briar!1125
 2019-06-09 14:24:40 +00:00
akwizgran
6519706599 Merge branch '1579-remove-pending-contacts-button' into 'master' 
Show less obstrusive remove button for pending contacts

Closes #1579

See merge request briar/briar!1130
 2019-06-08 09:44:35 +00:00
Torsten Grote
76741bc2ba [android] show less obstrusive remove button for pending contacts 
This uses the same button as the RSS feed items
 2019-06-07 11:09:34 -03:00
akwizgran
60eefbf3e0 Use named constants. 2019-06-07 11:54:44 +01:00
Torsten Grote
6665235768 Merge branch '1232-pending-contact-states' into 'master' 
Add ContactManager support for pending contact states

See merge request briar/briar!1122
 2019-06-06 21:31:43 +00:00
akwizgran
ba19716e0f Don't broadcast disabled event whenever we close a socket. 2019-06-06 16:42:26 +01:00
akwizgran
41deff1bf3 Suppress redundant enabled/disabled events. 2019-06-06 16:42:26 +01:00
akwizgran
1ec3fa3ade Implement Tor rendezvous crypto. 2019-06-06 16:42:26 +01:00
akwizgran
64ae99bbce Handle corner cases such as removal during rendezvous. 2019-06-06 16:40:55 +01:00
akwizgran
ed1cefa144 Use concurrent map for pending contact states. 2019-06-06 16:40:54 +01:00
akwizgran
23354d6568 Use predicates to match events. 2019-06-06 16:40:54 +01:00
akwizgran
1aa579a44f Add unit tests for pending contact state. 2019-06-06 16:40:54 +01:00
akwizgran
98191fb059 Add ContactManager support for pending contact states. 2019-06-06 16:40:54 +01:00
Torsten Grote
b9283ea654 Merge branch '1232-rendezvous-poller-expiry' into 'master' 
Use periodic poll task for expiry

See merge request briar/briar!1127
 2019-06-06 15:12:08 +00:00
akwizgran
71b1f99b56 Use regular poll task for expiry. 2019-06-06 13:45:00 +01:00
Torsten Grote
2982a874d4 Merge branch '1232-rendezvous-poller-cleanup' into 'master' 
Small cleanups for rendezvous poller

See merge request briar/briar!1126
 2019-06-06 12:04:08 +00:00
akwizgran
ea228164dc Check that poller instance isn't reused. 2019-06-06 12:11:31 +01:00
akwizgran
4b5ad9ace4 Make test expectations modular. 2019-06-06 12:11:31 +01:00
Torsten Grote
a94ffd413c Merge branch '1232-transfer-pending-contact-alias' into 'master' 
Transfer pending contact alias to contact

See merge request briar/briar!1124
 2019-06-05 17:11:48 +00:00
Torsten Grote
1f921753fd Merge branch '1567-rendezvous-poller' into 'master' 
Create poller for rendezvous connections

Closes #1567

See merge request briar/briar!1121
 2019-06-05 17:08:31 +00:00
Torsten Grote
157b64e643 Merge branch 'pending-contacts-crash' into 'master' 
Don't call setValue() on a background thread

See merge request briar/briar!1123
 2019-06-05 16:57:04 +00:00
akwizgran
6f285c5b0a Transfer pending contact alias to contact. 2019-06-05 17:48:02 +01:00
akwizgran
bf39c30d24 Don't call setValue() on a background thread. 2019-06-05 17:45:12 +01:00
akwizgran
7439e5579f Let plugins know if we're Alice or Bob. 2019-06-05 11:23:56 +01:00
akwizgran
4452dacc94 Make RendezvousCrypto package-private. 2019-06-05 11:01:28 +01:00
akwizgran
0579157010 Include protocol version in rendezvous key derivation. 2019-06-05 10:59:21 +01:00
akwizgran
3dbd0b80aa Make rendezvous constants package-private. 2019-06-05 10:58:12 +01:00
akwizgran
3863df3c1f Poll pending contact immediately when added. 2019-06-05 10:44:08 +01:00
akwizgran
08a5b8393f Add unit test for starting rendezvous poller. 2019-06-05 10:44:07 +01:00
akwizgran
92dea21c67 Run commit actions in unit tests. 2019-06-05 10:44:07 +01:00
akwizgran
82a52638cf Derive rendezvous key from static master key. 2019-06-05 10:44:07 +01:00
akwizgran
a38113e862 Add rendezvous poller. 2019-06-05 10:44:07 +01:00
akwizgran
7fd8ad65be Make RendezvousEndpoint closeable. 2019-06-05 10:44:06 +01:00
akwizgran
ce9c7cb32a Add requireNull() utility method. 2019-06-05 10:44:06 +01:00
akwizgran
5d2252ebda Add method for deriving rendezvous key. 2019-06-05 10:44:06 +01:00
akwizgran
3820d7413c Rename rendezvous handler to endpoint. 2019-06-05 10:44:06 +01:00
akwizgran
ab90e1de04 Pass incoming connection handler to plugins. 2019-06-05 10:44:05 +01:00
Torsten Grote
a650d812fa Merge branch '1571-connection-manager-pending-contacts' into 'master' 
Add rendezvous connection support to connection manager

Closes #1571

See merge request briar/briar!1120
 2019-06-04 14:08:05 +00:00
akwizgran
c536782e01 Remove redundant use of IO executor. 2019-06-04 14:23:47 +01:00
akwizgran
9ffd1ec2c2 Unregister connection if sending stream header fails. 2019-06-04 14:20:57 +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
0951508af7 Define PROOF_BYTES as MAC_BYTES. 2019-06-04 12:38:21 +01:00
akwizgran
34a5b69100 Reuse TransportCrypto#isAlice(). 2019-06-04 12:21:17 +01:00
akwizgran
d939fe80bd Explicitly check length of proof of ownership. 2019-06-04 12:17:10 +01:00
akwizgran
4ea8a4732c Fix race conditions in ForumSharingIntegrationTest. 2019-06-04 11:57:39 +01:00
Torsten Grote
da67cae4ce Merge branch 'test-sync-at-higher-level' into 'master' 
Test sync at a higher level

See merge request briar/briar!1116
 2019-06-04 10:37:31 +00:00