Torsten Grote
fbcf334941
Merge branch 'use-contact-id-as-conversation-id' into 'master'
...
Use contact ID rather than messaging group ID to identify conversation
We originally used the private messaging group ID to identify the private conversation, but now that the conversation includes messages from multiple clients it's more appropriate to use the contact ID.
This refactoring isn't urgent - I've had the branch lying around for a while, but I'm putting it up for review because #734 will touch some of the same code.
See merge request !386
2016-11-07 11:24:11 +00:00
akwizgran
7c3805260d
Merge branch '643-allow-messages-to-be-deleted-in-the-delivery-hook' into 'master'
...
Allow messages to be deleted in delivery hook
Closes #643
See merge request !385
2016-11-04 16:14:44 +00:00
akwizgran
51bcf7b1b8
Don't use messaging group ID as proxy for contact ID.
2016-11-04 15:50:44 +00:00
Torsten Grote
719a53dc94
Address review comments
2016-11-04 12:58:12 -02:00
Torsten Grote
3f9a254a0b
Allow messages to be deleted in delivery hook
2016-11-04 12:52:33 -02:00
akwizgran
e810a1265a
Merge branch '205-unit-tests-for-keymanagerimpl-and-transportkeymanager' into 'master'
...
Add unit tests for KeyManagerImpl
This also creates a `TransportKeyManager` interface and a factory for that to be able to test things separately.
Closes #205
See merge request !380
2016-11-04 14:29:21 +00:00
Torsten Grote
c36f5c795b
Address review comments for TransportKeyManagerImplTest
2016-11-04 11:04:44 -02:00
Torsten Grote
f52186ac8c
Add unit tests for KeyManagerImpl and create TransportKeyManager
...
interface and a factory for that.
2016-11-04 10:54:56 -02:00
akwizgran
e0f4be931d
Merge branch '708-private-group-fixup' into 'master'
...
Let only the creator invite new members to private groups
A little bug I noticed when reviewing the implementation of the invitation protocol.
See merge request !383
2016-11-04 09:33:50 +00:00
akwizgran
7536c00a34
Merge branch '708-private-group-remove-new-member-announcement' into 'master'
...
Remove new member announcement and add signature to join message
See merge request !384
2016-11-04 09:32:40 +00:00
akwizgran
847b6e4179
Added comments to integration test.
2016-11-04 09:32:21 +00:00
Torsten Grote
58793068c3
Address review comments
2016-11-03 17:26:37 -02:00
Torsten Grote
7125248677
Remove new member announcement and add signature to invitation
2016-11-03 17:24:31 -02:00
Torsten Grote
4bad7076e7
Merge branch '674-ending-a-transaction-can-throw-an-exception-in-a-finally-block' into 'master'
...
Replace transaction.setComplete() by database.commitTransaction()
Closes #674
See merge request !374
2016-11-03 19:23:16 +00:00
akwizgran
2bb16bb75f
Merge branch '348-testers-did-not-understand-qr-code-workflow' into 'master'
...
Improve QR code workflow slightly
* Improve wording so contacts know they need meet up to scan
and scan each other's codes
* Use consistent progress bar styles
Closes #348
See merge request !381
2016-11-03 15:56:19 +00:00
Torsten Grote
b5a427f876
Let only the creator invite new members to private groups
2016-11-02 17:40:33 -02:00
Torsten Grote
b34b4623ed
Replace transaction.setComplete() by database.commitTransaction()
2016-11-02 13:04:31 -02:00
Torsten Grote
f3b9214702
Improve QR code workflow slightly
...
* Improve wording so contacts know they need meet up to scan
and scan each other's codes
* Use consistent progress bar styles
2016-11-02 12:43:41 -02:00
akwizgran
36f087c512
Merge branch '724-unit-tests-for-clienthelperimpl' into 'master'
...
Add Unit Tests for ClientHelper
Closes #724
See merge request !379
2016-11-02 11:04:07 +00:00
akwizgran
0c30f16d7e
Merge branch '731-bdf-reader-open-lists-and-dictionaries' into 'master'
...
Don't throw IllegalStateException if BDF input is incomplete
Closes #731
See merge request !378
2016-11-01 17:40:13 +00:00
akwizgran
4d8a84a48d
Don't throw IllegalStateException if BDF input is incomplete.
2016-11-01 17:38:23 +00:00
akwizgran
2650f3114e
Merge branch '518-limit-the-depth-of-nested-bdf-structures' into 'master'
...
Limit the depth of nested BDF structures
Closes #518
See merge request !375
2016-11-01 17:30:50 +00:00
Torsten Grote
dfdde9799f
Add Unit Tests for ClientHelper
2016-11-01 15:28:28 -02:00
akwizgran
114a2dc8f2
Merge branch '427-local-author-caching' into 'master'
...
Cache the local author and load before the db latch is released
Closes #427 , #588
See merge request !354
2016-11-01 17:21:14 +00:00
akwizgran
642fa7df18
Removed unused field, renamed nickname methods.
2016-11-01 17:17:40 +00:00
akwizgran
c85767d2a0
Nickname is all one word.
2016-11-01 17:12:30 +00:00
Torsten Grote
55af1b954e
Limit the depth of nested BDF structures
2016-11-01 14:52:00 -02:00
Ernir Erlingsson
88272c5d61
improvements after dev comments
2016-11-01 13:33:12 +01:00
Ernir Erlingsson
eaa393a7ed
added a cache to the IdentityManager, changed its signature, modified when and where the author is stored
...
made the author creation single-threaded again in the LifecycleManager, removed redundant code
2016-11-01 12:51:49 +01:00
akwizgran
19080ad957
Merge branch '723-unit-tests-for-contactmanagerimpl' into 'master'
...
Add Unit tests for ContactManager
Closes #723
See merge request !376
2016-11-01 11:50:47 +00:00
Torsten Grote
7eeeb5f1ed
Add Unit tests for ContactManager
2016-11-01 09:40:05 -02:00
akwizgran
d55503ee92
Merge branch '722-implement-ux-design-for-inviting-new-members-to-a-group' into 'master'
...
Implement UX design for inviting new members to a group
Closes #722
See merge request !373
2016-11-01 11:38:29 +00:00
Torsten Grote
8448d27d20
Implement UX design for inviting new members to a group
2016-11-01 09:27:23 -02:00
akwizgran
47d6fc526f
Merge branch '678-implement-ux-for-viewing-the-membership-of-a-private-group' into 'master'
...
Implement UX for viewing the membership of a private group
This MR is the second and last MR to address #678 . The first part is in !377 .
Closes #678
See merge request !364
2016-11-01 11:12:21 +00:00
Torsten Grote
3da879cfd9
Address review comments for group member list
2016-11-01 09:09:22 -02:00
Torsten Grote
8fdce5ba51
Group Member List UI
2016-11-01 09:09:20 -02:00
akwizgran
f759a7506f
Merge branch '600-remove-content-type-from-private-messages' into 'master'
...
Remove content-type and parentId from private messages
and turn them into a regular string.
Closes #600
See merge request !372
2016-11-01 11:05:30 +00:00
akwizgran
0b11aea7a2
Merge branch '672-implement-ux-for-dissolving-a-group' into 'master'
...
Implement UX for when a group has been dissolved
This MR is based on !367 .
Closes #672
See merge request !369
2016-11-01 11:02:27 +00:00
akwizgran
aa954cee63
Merge branch '671-implement-ux-for-leaving-a-group' into 'master'
...
Implement UX for leaving a group
This MR also includes the creator's part of the UX for dissolving a group since it is almost the same.
Closes #671
See merge request !367
2016-11-01 10:57:33 +00:00
akwizgran
68024c264e
Merge branch '700-update-blog-backend-to-match-current-usage' into 'master'
...
Update blog backend to match current usage
Closes #700
See merge request !371
2016-11-01 10:56:02 +00:00
Torsten Grote
78740a6942
Remove content-type and parentId from private messages
...
and turn them into a regular string.
2016-11-01 08:39:15 -02:00
Torsten Grote
9e553ef9c8
Update blog backend to match current usage
2016-11-01 08:34:29 -02:00
Torsten Grote
1147b8ffaf
Disable group before loading messages
2016-11-01 08:26:40 -02:00
Torsten Grote
67866dbe66
Implement UX for when a group has been dissolved
2016-11-01 07:41:55 -02:00
Torsten Grote
8dac2d1ca6
Implement UI for dissolving and leaving group
2016-11-01 07:40:56 -02:00
Torsten Grote
b0a5a69b81
Remove group from database in PrivateGroupManager
2016-11-01 07:39:35 -02:00
akwizgran
a18317e912
Merge branch '681-convert-forum-post-bodies-to-strings-remove-content-type' into 'master'
...
Remove forum content type and change bodies to string
Also removes support for anonymous forum posts.
This MR depends on !360 .
Closes #698 , #681
See merge request !370
2016-10-31 21:34:24 +00:00
akwizgran
ad7d0d8e74
Merge branch '678-private-group-hooks-and-membership' into 'master'
...
Add methods and hooks to PrivateGroupManager related to members and removal
This MR is the first of two MRs related to #678 .
See merge request !377
2016-10-31 16:27:15 +00:00
akwizgran
fe79131f4a
Merge branch '678-contact-list-refactoring' into 'master'
...
Refactor contact lists, their adapters and items
This was supposed to be a preparation for #678 to make the contacts lists cleaner and easier to re-use for different use-cases. Turns out #678 can't use this work, but it is probably nice to have anyway.
During this work, support for multiple identities has been removed from the various contact lists.
See merge request !363
2016-10-31 15:39:48 +00:00
Torsten Grote
cb61d91074
Add methods and hooks to PrivateGroupManager related to members and removal
2016-10-31 13:23:03 -02:00
