Commit Graph

1898 Commits

Author SHA1 Message Date
akwizgran
f92f1908f5 Merge branch '224-unique-author-id' into 'master'
Allow different identities to have the same contact. #224

Previous fix was incomplete, the DB still had a unique constraint on the author ID column of the contacts table.

See merge request !91
2016-02-02 17:06:35 +00:00
akwizgran
3697fc6eb1 Allow different identities to have the same contact. 2016-02-02 17:00:54 +00:00
akwizgran
ffbcd550e6 Merge branch '239-proguard-dependency-cleanup' into 'master'
239 proguard dependency cleanup

Closes #239 

See merge request !89
2016-02-02 16:11:48 +00:00
akwizgran
1f18aae0f1 Merge branch '235-transport-key-manager-deadlock' into 'master'
Avoid potential deadlock in TransportKeyManager. #235

See rambling description on the ticket and in the architecture channel...

Fixes #235.

See merge request !79
2016-02-02 15:35:28 +00:00
akwizgran
933eee1826 Merge branch '117-bqp-crypto' into 'master'
BQP crypto

This implements the `CryptoComponent` methods necessary for BQP.

Part of #117.

See merge request !88
2016-02-02 15:34:26 +00:00
Ernir Erlingsson
73c67e2e82 tweaked proguard 2016-02-02 12:21:08 +01:00
Ernir Erlingsson
d340d69742 added proguard and cleaned dependencies 2016-02-02 12:20:26 +01:00
akwizgran
86a814786a Merge branch 'remove-old-build-files' into 'master'
Remove Ant build files and Eclipse project files.

No longer needed for building or testing, and a pain to maintain.

See merge request !87
2016-02-02 10:48:24 +00:00
str4d
c822623677 Migrate Bluetooth protocol to BQP's master secret derivation 2016-02-02 02:45:49 +00:00
str4d
77e4ec381a Implement BQP crypto 2016-02-02 02:45:49 +00:00
str4d
4d7a23779a Rename crypto methods and constants for Bluetooth key agreement 2016-02-02 02:45:49 +00:00
akwizgran
35090f4d0e Bumped expiry date to 1 March 2016. 2016-02-01 15:16:15 +00:00
akwizgran
b65be93a20 Merge branch 'unshared-messages' into 'master'
Unshared messages



See merge request !86
2016-01-29 14:55:26 +00:00
akwizgran
e14ff46356 Removed Ant build files and Eclipse project files. 2016-01-29 14:47:27 +00:00
akwizgran
ee6379cb0c Fixed missing Inject annotation. 2016-01-29 14:45:57 +00:00
akwizgran
062b987585 Merge branch 'private-groups' into 'master'
Factored out code for creating private groups.



See merge request !85
2016-01-29 13:46:29 +00:00
akwizgran
e76aef3dc8 Unshared messages. 2016-01-29 13:45:22 +00:00
akwizgran
323a47d2f0 Merge branch '224-duplicate-contacts' into 'master'
Allow multiple identities to have the same contact. #224



See merge request !82
2016-01-29 13:12:48 +00:00
akwizgran
e1ba1465e0 Merge branch 'remove-external-storage-permission' into 'master'
Don't use external storage for crash/test reports.

Crash/test reports were written to external storage so they could be attached to emails - by putting the information in the body of the email we can avoid needing the WRITE_EXTERNAL_STORAGE permission.

Also updated the email address for crash/test reports.

See merge request !83
2016-01-29 13:12:12 +00:00
akwizgran
4e17621081 Factored out code for creating private groups. 2016-01-28 18:05:01 +00:00
akwizgran
2584fb52b9 Don't use external storage for crash/test reports. 2016-01-28 16:29:06 +00:00
akwizgran
0fd8a67ee0 Allow multiple identities to have the same contact. #224 2016-01-28 15:57:22 +00:00
akwizgran
ce9a81ff98 Merge branch '218-remove-unicode-from-tests' into 'master'
Remove unescaped Unicode from tests. #218

Fixes #218.

See merge request !81
2016-01-28 15:12:20 +00:00
akwizgran
1589279c2f Merge branch '229-transport-client' into 'master'
Transport properties client. #229

This branch moves support for exchanging transport properties from the sync layer to the client layer.

Local properties are stored in an unshared group. When a contact is added, the latest local properties are copied into a group shared with the contact. Whenever the local properties are updated, they're copied into the groups shared with all contacts.

The transport update messages include a unique device ID that prevents collisions between local and remote messages, and will be used in future for multi-device support.

See merge request !80
2016-01-28 15:05:00 +00:00
akwizgran
9ce39f3f21 Renamed Latest to LatestUpdate for clarity. 2016-01-28 14:49:35 +00:00
akwizgran
857abd6c11 Merge branch '82-identicons' into 'master'
Identicons

Closes #120. Part of #82.

I pulled in the identicon code because there is no published library, and also because when I used it for Bote I ended up modifying the code somewhat for my purposes; I expect the same to happen here.

I am not sure what information should be used to seed the identicon. I originally thought of using the public key, but that seemed to change the identicon every single page load (obviously the representation wasn't consistent). Then I tried using the `ContactId`, which was fine until I got to adding an identicon to `AuthorView`: activities that use it are only passed (via Intent) a name, not anything else. Hence `AuthorView` identicons are currently inconsistent with the contact list and conversations.

See merge request !51
2016-01-27 17:49:52 +00:00
akwizgran
58b6037912 Remove unescaped Unicode from tests. #218 2016-01-27 14:11:32 +00:00
akwizgran
d63f997813 Fixed bug in detection of unchanged properties. 2016-01-27 12:51:56 +00:00
akwizgran
c776d1e893 Include unique device ID in transport updates. 2016-01-27 12:51:55 +00:00
akwizgran
88475bdd54 Transport properties client. #229 2016-01-27 12:51:55 +00:00
akwizgran
baa580c6f4 Replace for with foreach.
I don't care but Android Studio complains.
2016-01-27 12:51:55 +00:00
akwizgran
47e605fcd8 Don't flush buffers on every commit.
This was meant to prevent key reuse with BTPv1, it's no longer needed with BTPv2.
2016-01-27 12:51:54 +00:00
akwizgran
093e44d3ab Cleaned up database initialisation. 2016-01-27 12:51:54 +00:00
akwizgran
cd175fd119 Removed TransportUpdate and TransportAck. 2016-01-27 12:51:54 +00:00
akwizgran
ea02caf577 Don't use FLAG_ACTIVITY_CLEAR_TASK on API < 11. 2016-01-27 12:51:00 +00:00
str4d
90eded1421 Make identicons round
This commit renames identicons to avatars in field names, and uses an ImageView
derivative to show the identicons, which should make implementing #214 easier.
2016-01-26 20:21:35 +00:00
str4d
9749eefb90 Make symmetric identicons 9x9 instead of 5x5 2016-01-26 19:36:21 +00:00
str4d
9318a50cb7 Migrate LocalAuthorSpinnerAdapter to XML, add identicons 2016-01-26 18:34:03 +00:00
str4d
35c59fdb39 Migrate AuthorView to XML, add identicon 2016-01-26 18:34:03 +00:00
str4d
88d81634ca Add identicons to conversations 2016-01-26 18:34:02 +00:00
str4d
e62d60ff52 Add identicons to contact list 2016-01-26 18:34:02 +00:00
str4d
c7387ee37c Modify IdenticonBase to use a dark background for light identicons 2016-01-26 18:34:02 +00:00
str4d
dfb9222ccd Modify IdenticonBase to use Briar's hashing and to use byte[] instead of String 2016-01-26 18:32:20 +00:00
akwizgran
06ade19260 Fixed potential deadlock in TransportKeyManager. #235 2016-01-26 10:32:12 +00:00
akwizgran
f2e1723b24 Added thread safety documentation to interfaces. 2016-01-26 10:31:32 +00:00
str4d
d645c435fd Identicon generation code from Android-Identicons
Source: https://github.com/saiimons/Android-Identicons
License: Apache License, Version 2.0
2016-01-26 01:39:02 +00:00
akwizgran
f9aa5a4ef9 Merge branch '234-remove-consumers' into 'master'
Removed consumers from BdfWriter. #234

Cleaning up some unused code.

See merge request !76
2016-01-22 14:04:53 +00:00
akwizgran
d512c218cd Removed consumers from BdfWriter. 2016-01-22 11:50:06 +00:00
akwizgran
d69a242f19 Merge branch '30-navigation-drawer-rebased' into 'master'
Navigation drawer (squashed and rebased).

This is @ernir's work on #30 and #181, rebased onto master with recent changes to ConversationActivity and ForumListActivity ported to the respective fragments.

See merge request !75
2016-01-22 10:33:25 +00:00
akwizgran
6de99ed203 Merge branch '225-bluetooth-address' into 'master'
Show Bluetooth address from Settings.Secure in TestingActivity

* To help with investigating #225 (and maybe other bugs in future), show the Bluetooth address from Settings.Secure as well as the address from BluetoothAdapter.getAddress()
* Add Settings.Secure.ANDROID_ID to the entropy pool - it may provide up to 64 bits of extra entropy from the perspective of a remote attacker (no extra bits from the perspective of a local attacker in the same user account, who sees the same ANDROID_ID)


See merge request !73
2016-01-21 17:12:13 +00:00