Commit Graph

1721 Commits

Author SHA1 Message Date
akwizgran
d635cede57 Upgrade Tor to 0.2.7.6. #166 2015-12-21 14:42:39 +00:00
akwizgran
a3ecd93999 Merge branch '169-blake2' into 'master'
Switch KDF from SHA-256 to Blake2. #169

The BTP spec calls for Blake2s, but there's no Java implementation available. I suggest we go with Blake2b for now. If it turns out to be a performance bottleneck on 32-bit platforms we can consider implementing Blake2s and merging it upstream.

This depends on !13.

See merge request !21
2015-12-18 16:43:45 +00:00
akwizgran
a63384a91f Merge branch '111-stream-encryption' into 'master'
Stream encryption for BTP version 2. #111

This patch implements the stream header from the BTPv2 spec (https://code.briarproject.org/akwizgran/briar/wikis/BTP).

This merge request depends on !13.

See merge request !18
2015-12-18 16:43:06 +00:00
akwizgran
ad0972877b Updated TestStreamEncrypter/Decrypter. 2015-12-18 13:34:02 +00:00
akwizgran
e6eb1707a9 Set STREAM_HEADER_IV_LENGTH to 24 to match spec. 2015-12-18 13:34:02 +00:00
akwizgran
f2efe7f2ea Implement stream header for BTPv2. #111 2015-12-18 13:34:02 +00:00
akwizgran
766179ac97 Use new UI/DB interface in BriarService. 2015-12-17 16:56:58 +00:00
akwizgran
351e1bbbe6 Facade for forum post headers. #172 2015-12-17 16:56:58 +00:00
akwizgran
f899bc0c38 Facade for private message headers. #173 2015-12-17 16:56:58 +00:00
akwizgran
87689855da Facades for private messaging. #173 2015-12-17 16:56:58 +00:00
akwizgran
4450ab171a Facades for forums. #172 2015-12-17 16:56:58 +00:00
akwizgran
d0ba274111 Use new UI/DB interfaces for adding contacts. 2015-12-17 16:56:58 +00:00
akwizgran
f72b3d6294 Use new UI/DB interfaces for forums. 2015-12-17 16:56:58 +00:00
akwizgran
412f7b994a Use new UI/DB interfaces for identities. 2015-12-17 16:56:58 +00:00
akwizgran
122380db66 Use new UI/DB interfaces for private messaging. 2015-12-17 16:56:57 +00:00
akwizgran
886074e50e Code cleanup. 2015-12-17 16:56:57 +00:00
akwizgran
52720c5c04 Pass-through implementations of UI/DB interfaces. 2015-12-17 16:56:57 +00:00
akwizgran
c5282c5b17 Moved some API classes into packages. 2015-12-17 16:56:57 +00:00
akwizgran
9fbdb08cf1 Created interfaces for use by UI. #172 #173 2015-12-17 16:56:57 +00:00
akwizgran
545a2c04bb Merge branch 'explain-tor-setting' into 'master'
Longer explanatory text for Tor mobile data setting



See merge request !29
2015-12-17 16:56:27 +00:00
akwizgran
3e3109254f Merge branch 'conversation-layout-tweaks' into 'master'
Layout tweaks for ConversationActivity.

Centre the progress wheel and empty list message, hide the empty list message until the list has loaded.

See merge request !26
2015-12-17 16:35:36 +00:00
akwizgran
6dd64ed02e Merge branch '179-bluetooth-diagram-too-large' into 'master'
Replace bluetooth diagram PNG image with vector XML file.

I decided to not use several raster graphics, but use an XML file instead, so the android gradle plugin creates the raster files itself at build-time. I hope that this resolves the problem you saw on that device of yours.

See merge request !30
2015-12-17 14:49:07 +00:00
akwizgran
8725c08351 Merge branch '96-show-available-transports' into 'master'
Show which transports are currently available

Show all transports on the dashboard and indicate which transports are currently available.
The icons have been chosen from the official material icons and might be
replaced later with icons that better represent the given transport.

Please note that I used vector drawables which will be automatically
converted at build time to raster graphics.

See merge request !28
2015-12-17 14:39:19 +00:00
Torsten Grote
d99b643a58 Replace bluetooth diagram PNG image with vector XML file.
Closes #179
2015-12-17 11:58:41 -02:00
Torsten Grote
264285ecf7 Show all transports on the dashboard
and indicate which transports are currently available.
The icons have been chosen from the official material icons and might be
replaced later with icons that better represent the given transport.

Please note that I used vector drawables which will be automatically
converted at build time to raster graphics.

Closes #96
2015-12-17 11:34:10 -02:00
Torsten Grote
2d28dcada2 Create two new events to signal enabling and disabling of transports 2015-12-17 11:34:10 -02:00
akwizgran
2c52a95ad5 Explanatory text for Tor mobile data setting. 2015-12-17 12:39:23 +00:00
akwizgran
c7e4d5ffa9 Merge branch '147-crypto_secretbox' into 'master'
147 crypto secretbox

Closes #147

See merge request !27
2015-12-17 09:23:26 +00:00
str4d
d9808c48f0 Implement XSalsa20/Poly1305 2015-12-16 19:51:14 +00:00
str4d
3f54657ca0 Simple test vectors for XSalsa20/Poly1305
Test vectors taken from NaCl paper.
2015-12-16 19:51:06 +00:00
str4d
20b2bcb86f Expand JavaDocs for AuthenticatedCipher 2015-12-16 19:50:57 +00:00
Torsten Grote
c26d1a27e7 Merge branch '178-bluetooth-setting' into 'master'
Use default value of false for Bluetooth setting. #178



See merge request !25
2015-12-16 12:56:57 +00:00
akwizgran
e9226dc8e2 Fixed some missing imports from recent refactoring. 2015-12-16 12:50:17 +00:00
akwizgran
fb850eac09 Bumped database schema version (backward compatible). 2015-12-16 12:17:38 +00:00
akwizgran
60a5b28e57 Renamed DatabaseComponentTest. 2015-12-16 12:17:38 +00:00
akwizgran
6e61504d24 Removed message expiry code. #180 2015-12-16 12:17:38 +00:00
akwizgran
01ecfb435a Updated Roboguice modules list. 2015-12-16 12:13:43 +00:00
akwizgran
9bb298ed44 Merge branch '174-bsp-renaming-again'
Conflicts:
	briar-android/src/org/briarproject/android/contact/ConversationActivity.java
2015-12-16 10:42:44 +00:00
akwizgran
8fa05e545f Merge branch '174-bsp-renaming' 2015-12-16 10:39:16 +00:00
akwizgran
81c9992075 Code style: squashed. 2015-12-15 17:26:28 +00:00
akwizgran
d710841728 Merge branch '37_optionally_disable_tor' into 'master'
37 optionally disable tor

Provides:

* Checkbox in the settings view to disable Tor if not connected to a wifi network
* A network change callback in the Tor plugin to identify wifi connect/disconnect events
* A settings change event handler to disable enable tor when the user enables or disables the setting



See merge request !11
2015-12-15 17:12:39 +00:00
akwizgran
b6c9544373 Layout tweaks for ConversationActivity. 2015-12-15 17:08:23 +00:00
akwizgran
660f709ede Use default value of false for Bluetooth setting. #178 2015-12-15 16:09:09 +00:00
akwizgran
bab9a41981 Merge branch '97-show-connection-status-of-contact-in-conversation-view' into 'master'
Show connection status of contact in conversation view



See merge request !24
2015-12-15 15:59:40 +00:00
Santiago Torres
403ab75d13 [plugins/tor/TorPlugin] Adds tor-over-wifi setting
Provides a checkbox in the settings view, as well as an event handler to
disable/enable the tor network if the device is not on using the wifi
connection.

Refactors network-enabling code to a separate function. This function
is ran after the network state changes, or the settings change and
will update the status accordingly.
2015-12-15 10:17:29 -05:00
Torsten Grote
327073f514 Put conversation view layout in XML file
and fix message divider background for lower API levels.
2015-12-15 13:11:11 -02:00
Torsten Grote
2bd53f8363 Show connection status of contact in conversation view
Closes #97
2015-12-15 13:11:11 -02:00
akwizgran
2ca2356ecc Moved MessageHeader to sync package. 2015-12-15 15:05:16 +00:00
akwizgran
e370cafb12 Moved classes from messaging package to sync package. 2015-12-15 15:05:06 +00:00
akwizgran
d99df73380 Trimmed some Roboguice boilerplate. 2015-12-15 14:00:51 +00:00