Commit Graph

2466 Commits

Author SHA1 Message Date
akwizgran e85b2161e4 Merge branch '241-notification-privacy' into 'master'
Set category and visibility of notifications. #241

Turns out we can't fully control the visibility of notifications on the lock screen - we can mark them as sensitive, and then a couple of global options determine whether they're visible.

See merge request !96
2016-02-10 10:34:37 +00:00
akwizgran 299a541dee Set category and visibility of notifications. #241 2016-02-10 10:31:31 +00:00
Torsten Grote d0ab16de2d Merge branch 'merge-settings' into 'master'
Fix a couple of bugs in settings

1. SettingsFragment wasn't receiving events because it extended BaseFragment rather than BaseEventFragment
2. Removed broken logic for deciding whether to broadcast a SettingsUpdatedEvent
3. Added the namespace to SettingsUpdatedEvent so listeners can decide whether to react

See merge request !97
2016-02-09 16:55:42 +00:00
Torsten Grote 5dab0c0dcb Merge branch '242-anonymous-forum-crash' into 'master'
Fix crashes, rotation issues with forum posts. #242, #243



See merge request !93
2016-02-09 16:51:45 +00:00
Torsten Grote b1cb39e88c Merge branch 'validation-hooks' into 'master'
Run hooks when messages are validated

This patch allows clients to respond to messages reliably. Like the hooks for adding/removing contacts/identities, these hooks may be run more than once - that will be fixed when we have client-layer transactions.

See merge request !95
2016-02-09 16:48:49 +00:00
akwizgran ead4aac56c No alpha for white icons on dark backgrounds. 2016-02-08 16:48:06 +00:00
akwizgran 3d948ed461 Don't broadcast an event unless settings have changed. 2016-02-08 11:17:45 +00:00
akwizgran b63961727d Removed unused injection. 2016-02-05 18:48:42 +00:00
akwizgran 408776f5d3 Use settings manager. 2016-02-05 18:46:18 +00:00
akwizgran bdc17dfc8e Fixed a couple of bugs in settings. 2016-02-05 18:22:37 +00:00
akwizgran bb46f2983f Merge branch 'giant-indentation-patch' into 'master'
Indent everything with tabs

Probably the most exciting MR you'll ever read. Bonus points if you spot the NSA backdoor hidden among the whitespace changes.

See merge request !90
2016-02-05 14:57:29 +00:00
akwizgran 4decdbf3e6 Giant whitespace-only indentation patch. 2016-02-05 14:54:17 +00:00
akwizgran 741571bdb8 Run hooks when messages are validated. 2016-02-05 12:08:48 +00:00
akwizgran d75c51ec74 Invitation timeout is too short for some devices. 2016-02-04 17:52:45 +00:00
akwizgran 26fecba77f Don't use ReferenceManager for forum post author. #243 2016-02-03 21:25:34 +00:00
akwizgran 78bc198b33 Don't throw exception is forum post is anonymous. #242 2016-02-03 20:56:17 +00:00
akwizgran 9a9d94e1c9 Merge branch 'remote-transport-properties' into 'master'
Store transport properties received by other means

We may receive transport properties while adding a contact, before the first sync connection is made. Store them in the group shared with the contact, flagged as remote properties in the metadata, but don't share them with the contact. Use a version number of zero so any properties synced from the contact will supersede them.

See merge request !92
2016-02-03 16:13:34 +00:00
akwizgran 9e1000c1b3 Store transport properties received by other means. 2016-02-03 16:03:44 +00:00
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