a5041e651e
Merge branch '1230-strings-adding-contact-slow' into 'master'
...
Add strings for warning when adding a contact is slow
See merge request briar/briar!1135
2019-06-15 13:37:13 +00:00
b0e97d787f
Add offline state for pending contacts.
2019-06-15 12:27:24 +01:00
0d8af780a3
Add strings for duplicate pending contacts.
2019-06-15 11:31:18 +01:00
9c20e6b333
Add string for pending contact offline state.
2019-06-15 11:04:22 +01:00
ab14976c96
Add strings for warning when adding a contact is slow.
2019-06-15 11:01:09 +01:00
ec3f821ba6
Update test expectations.
2019-06-13 17:17:50 +01:00
1d546da781
Store sync versions received from contacts.
2019-06-13 17:07:12 +01:00
f2c951b70b
Add DB methods for getting and setting sync versions.
2019-06-13 17:06:57 +01:00
1e259c100d
Add sync versions column to contacts table.
2019-06-13 16:35:48 +01:00
3636aeba9a
Use HyperSQL-compatible syntax in migration.
2019-06-13 16:34:20 +01:00
132e20a6ce
Send versions record at start of each session.
2019-06-13 16:16:02 +01:00
c228e5c219
Add versions record to sync protocol.
2019-06-13 16:16:02 +01:00
ae1d1fc5a7
Add thread safety and null safety annotations.
2019-06-13 16:16:01 +01:00
37f02a40e9
Merge branch '1585-temporary-messages' into 'master'
...
Add support for temporary messages
See merge request briar/briar!1132
2019-06-12 15:39:02 +00:00
3c8b8c39e1
Turn commonly used variables into fields.
2019-06-12 16:29:24 +01:00
8f839e2c30
Remove temporary messages at startup.
2019-06-12 15:21:48 +01:00
da4b63f20f
Clean up ValidationManagerImplTest.
2019-06-12 15:17:13 +01:00
cd40e771d2
Allow messages to be marked as temporary.
2019-06-12 15:11:10 +01:00
dd7accfa95
Merge branch '1576-db-before-signing-in' into 'master'
...
Retry database tasks after signing in
Closes #1576
See merge request briar/briar!1131
2019-06-10 16:33:47 +00:00
1cf993484d
Avoid unnecessary reloads.
2019-06-10 17:24:58 +01:00
e810785fe2
Retry database tasks after signing in.
2019-06-10 15:51:20 +01:00
7ec826ccb7
Merge branch '1562-intent-router' into 'master'
...
Receive external intents through NavDrawerActivity
Closes #1562
See merge request briar/briar!1128
2019-06-10 14:20:06 +00:00
4a4abd7efa
Merge branch '1232-polling-events' into 'master'
...
Show "connecting" state for pending contacts
See merge request briar/briar!1129
2019-06-10 13:11:06 +00:00
dc2e42e1f2
[android] don't check getIntent() for null as it should be non-null now
2019-06-10 07:39:49 -03:00
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
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
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
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
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
60eefbf3e0
Use named constants.
2019-06-07 11:54:44 +01:00
a4a45efd43
Broadcast event when polling newly added contact.
2019-06-07 11:48:53 +01:00
208ae6a4b6
Show recently polled pending contacts as "connecting".
2019-06-07 11:42:48 +01:00
fe1df6dafa
Move pending contact events to rendezvous poller.
2019-06-07 11:42:48 +01:00
15d9ff1ebd
Rename "connected" state to "connecting".
2019-06-07 11:42:10 +01:00
dc741e988c
Shorter description for "waiting for connection" state.
2019-06-07 11:42:10 +01:00
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
ba19716e0f
Don't broadcast disabled event whenever we close a socket.
2019-06-06 16:42:26 +01:00
41deff1bf3
Suppress redundant enabled/disabled events.
2019-06-06 16:42:26 +01:00
1ec3fa3ade
Implement Tor rendezvous crypto.
2019-06-06 16:42:26 +01:00
64ae99bbce
Handle corner cases such as removal during rendezvous.
2019-06-06 16:40:55 +01:00
ed1cefa144
Use concurrent map for pending contact states.
2019-06-06 16:40:54 +01:00
23354d6568
Use predicates to match events.
2019-06-06 16:40:54 +01:00
1aa579a44f
Add unit tests for pending contact state.
2019-06-06 16:40:54 +01:00
98191fb059
Add ContactManager support for pending contact states.
2019-06-06 16:40:54 +01:00
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
71b1f99b56
Use regular poll task for expiry.
2019-06-06 13:45:00 +01:00
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
ea228164dc
Check that poller instance isn't reused.
2019-06-06 12:11:31 +01:00
4b5ad9ace4
Make test expectations modular.
2019-06-06 12:11:31 +01:00
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
akwizgran