Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1147-bluetooth-discovery' into 'master'

Browse Source 
Support Bluetooth discovery for adding contacts

See merge request briar/briar!954
This commit is contained in:
akwizgran
2018-10-29 14:35:17 +00:00
parent 53da13794f 9c4fb4fd34
commit fcb88ed58c
10 changed files with 332 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java
View File

@@ -21,7 +21,7 @@ public interface KeyAgreementConstants {
/**
* The connection timeout in milliseconds.
*/
long CONNECTION_TIMEOUT = 20 * 1000;
long CONNECTION_TIMEOUT = 60_000;
/**
* The transport identifier for Bluetooth.