Commit Graph

5885 Commits

Author SHA1 Message Date
akwizgran 623707af0f Removed database locking. 2016-02-11 16:21:52 +00:00
akwizgran 0c392e8b78 Replaced PacketWriter methods with a constant. 2016-02-11 16:21:26 +00:00
akwizgran 747d9678fe Removed unused PrivateConversation class. 2016-02-11 15:05:14 +00:00
akwizgran 29b67d2e03 Merge branch 'forum-sharing-hooks' into 'master'
Use message validation hook in forum sharing client

This patch moves the forum sharing client's update handling from an event handler to a hook to ensure the update is handled even if it arrives just before shutdown.

See merge request !99
2016-02-11 12:44:23 +00:00
Torsten Grote 00beb654af Merge branch '238-delete-messages' into 'master'
Allow messages to be deleted.

Fixes #238.

See merge request !98
2016-02-10 17:59:45 +00:00
akwizgran 3f356b999a Increase contrast between identicon and background. 2016-02-10 15:48:35 +00:00
akwizgran bb11ebd5bd Use message validation hook in forum sharing client. 2016-02-10 14:47:25 +00:00
akwizgran 43558ca089 Merge branch 'remove-subscription-updates' into 'master'
Move subscription updates to the client layer

This is part of #112.

I created a separate client for sharing lists of available forums, as that turned out to be cleaner than using the forum client to manage two kinds of group. The same will presumably be true for the blog and group messaging clients when we come to implement them.

The UX for sharing forums is due to change - instead of sharing a list of available forums with no explanation, we'll explicitly invite contacts to join forums. When that happens, the ForumSharingManager will change but the ForumManager should remain pretty much the same.

When hooks for message status changes have been implemented, the ForumSharingManager will use those instead of listening for MessageValidatedEvents.

When client layer transactions have been implemented, the ForumManager, ForumSharingManager and TransportPropertyManager will use them instead of locks to ensure atomicity and isolation.

See merge request !94
2016-02-10 14:02:15 +00:00
akwizgran a91d500263 Added method for deleting metadata. 2016-02-10 14:01:55 +00:00
akwizgran 00275e260f Allow messages to be deleted. 2016-02-10 14:01:55 +00:00
akwizgran 525c323c1c Fixed race between loadHeaders() and loadAvailable(). 2016-02-10 10:47:30 +00:00
akwizgran 6e1ec41d21 Handle events that affect list of available forums. 2016-02-10 10:47:30 +00:00
akwizgran 18db17bf5b Moved subscription updates to the client layer. 2016-02-10 10:47:30 +00:00
akwizgran 54272c8836 MessageFactory never throws IOException. 2016-02-10 10:47:29 +00:00
akwizgran fd99dd7573 Updated a unit test for storing settings. 2016-02-10 10:47:29 +00:00
akwizgran 225d0ebeef DB interface cleanup, removed unnecessary exceptions. 2016-02-10 10:47:29 +00:00
akwizgran 3837efca6b Updated group-related events and exceptions. 2016-02-10 10:47:26 +00:00
akwizgran 9d537dce00 Removed contact subscriptions from database. 2016-02-10 10:46:41 +00:00
akwizgran 9fdc510843 Removed SubscriptionUpdate and SubscriptionAck. 2016-02-10 10:46:41 +00:00
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