Mark Haines
38681202dc
Add olm version to client. Add semicolons.
2016-09-14 20:03:31 +01:00
Mark Haines
0d20a0acf0
Add a test to check that we have the right version of Olm
2016-09-14 19:59:32 +01:00
Mark Haines
9277a86403
Add the accidentally deleted sessionId documentation back
2016-09-14 19:35:31 +01:00
Mark Haines
5ec8688cf6
Semicolon
2016-09-14 19:26:44 +01:00
Mark Haines
6ae82a9cb4
Fix syntax error
2016-09-14 19:20:46 +01:00
Mark Haines
72a4b92022
Send a 'm.new_device' when we get a message for an unknown group session
...
This should reduce the risk of a device getting permenantly stuck unable
to receive encrypted group messages.
2016-09-14 19:16:24 +01:00
Mark Haines
0cc68bc125
Update the olm library version to 1.3.0
2016-09-14 14:24:21 +01:00
Matthew Hodgson
6ca917f4db
Merge pull request #196 from matrix-org/matthew/filtered-timelines
...
Introduce EventTimelineSet, filtered timelines and global notif timeline.
2016-09-12 15:56:55 +01:00
Matthew Hodgson
8a848deddc
unbreak mocks in tests
2016-09-12 15:52:10 +01:00
David Baker
2ebd4b15a4
Merge pull request #203 from matrix-org/markjh/try_catch
...
Wrap the crypto event handlers in try/catch blocks
2016-09-12 14:32:46 +01:00
Mark Haines
f0274f3f26
Wrap the crypto event handlers in try/catch blocks
2016-09-12 11:44:31 +01:00
Matthew Hodgson
85b2e5d758
fix refactoring bug; emit timelineReset after updating _liveTimeline
2016-09-11 03:23:43 +01:00
Matthew Hodgson
eef03882ad
don't forget to emit timelineResets for normal room resets
2016-09-11 03:23:15 +01:00
Matthew Hodgson
f7e5d962c0
Merge branch 'develop' into matthew/filtered-timelines
2016-09-11 02:38:50 +01:00
Matthew Hodgson
87c6a40b3f
reemit timelineReset correctly from Sync
2016-09-11 02:15:29 +01:00
Matthew Hodgson
e614e17a71
correctly notify when timelineSets get reset
2016-09-10 10:44:48 +01:00
Matthew Hodgson
b4dc5e620b
oops, unbreak notif pagination
2016-09-10 01:36:12 +01:00
Matthew Hodgson
0713e65fc5
fix lint
2016-09-10 00:58:16 +01:00
Matthew Hodgson
b69f6cf70a
don't double-add events in Room.addEventsToTimeline
...
also, ignore notif events from initialSync as their time ordering is wrong
2016-09-10 00:56:37 +01:00
Matthew Hodgson
2c6409a67a
special case 'end' token
2016-09-09 18:45:15 +01:00
Matthew Hodgson
ad7db78829
only consider rooms when paginating EventTimelines with rooms
2016-09-09 18:05:43 +01:00
Matthew Hodgson
bd9e3e5794
only call setEventMetadata on unfiltered timelineSets
2016-09-09 17:42:24 +01:00
Matthew Hodgson
bd32ed5598
refactr paginateNotifTimeline out of existence
2016-09-09 16:49:39 +01:00
Matthew Hodgson
5a5257a598
fix comment
2016-09-09 16:41:29 +01:00
Matthew Hodgson
75b6ebf287
revert comment position
2016-09-09 16:35:38 +01:00
Matthew Hodgson
a9d3ae4ef8
fix tests
2016-09-09 16:34:02 +01:00
Matthew Hodgson
d480b6cf3e
remove unnecessary getUnfilteredTimelineSet()
2016-09-09 16:06:10 +01:00
Richard van der Hoff
fdb640e361
Merge pull request #202 from matrix-org/rav/decryption_warnings
...
Show warnings on to-device decryption fail
2016-09-09 14:09:05 +01:00
Richard van der Hoff
924a8533f1
Merge pull request #201 from matrix-org/rav/DisplayName
...
s/Displayname/DisplayName/
2016-09-09 14:08:36 +01:00
Richard van der Hoff
72b4f270ff
Show warnings on to-device decryption fail
...
If we can't decrypt a to-device message, show a warning about it, rather than
swallowing the error.
2016-09-09 12:37:02 +01:00
Richard van der Hoff
946539e32d
s/Displayname/DisplayName/
2016-09-09 11:32:57 +01:00
Matthew Hodgson
9882fed6d7
Merge branch 'develop' into matthew/filtered-timelines
2016-09-09 11:12:42 +01:00
Matthew Hodgson
93f45c0a94
reemit notif timeline events correctly
2016-09-09 02:28:01 +01:00
Matthew Hodgson
c6d358a6f3
doc Room.timeline event correctly
2016-09-09 02:27:51 +01:00
Matthew Hodgson
2e4c362ccd
make /notification pagination actually work
2016-09-09 02:08:39 +01:00
Matthew Hodgson
f959e1a134
incorporate PR feedback
2016-09-08 22:38:39 +01:00
Matthew Hodgson
7dfc4a404c
initial PR fixes
2016-09-08 17:51:14 +01:00
Richard van der Hoff
2af349eb72
Merge pull request #200 from matrix-org/rav/oh_hai_new_device
...
OH HAI
2016-09-08 16:20:59 +01:00
Richard van der Hoff
43f3a1e8b3
Merge pull request #199 from matrix-org/rav/share_megolm_state
...
Share the current ratchet with new members
2016-09-08 16:18:48 +01:00
Matthew Hodgson
13c186dfbe
fix lint
2016-09-08 15:29:53 +01:00
Matthew Hodgson
4d88736d13
add much-needed room.getUnfilteredTimelineSet() helper
2016-09-08 14:37:26 +01:00
Richard van der Hoff
1da633e28a
Handle new device announcements
...
When we see a new device, download its keys, and then add it to the list of
things waiting for a keyshare.
2016-09-08 14:35:13 +01:00
Richard van der Hoff
879da47f0e
Send an "oh hai" message to other e2e users
...
When we first complete an initial sync on a new device, send out an
m.new_device message for each user we share an e2e room with
2016-09-08 14:34:08 +01:00
Richard van der Hoff
cacafb461d
Share the current ratchet with new members
...
When a new member joins the room, we don't need to reset the megolm session;
instead we can just share the current state with the new user.
2016-09-08 14:20:54 +01:00
Richard van der Hoff
15e285c6b4
Merge pull request #198 from matrix-org/rav/refactor_crypto
...
Move crypto bits into a subdirectory
2016-09-08 13:35:38 +01:00
Richard van der Hoff
71c33420f6
Move crypto bits into a subdirectory
...
It was getting a bit sprawly; this should help keep things together.
2016-09-08 09:50:31 +01:00
Richard van der Hoff
e7f70bba5c
Merge pull request #197 from matrix-org/rav/refactor_crypto_event_handler
...
Refactor event handling in Crypto
2016-09-08 09:44:31 +01:00
Matthew Hodgson
e4ec2aa55f
maintain the global notification timeline set.
...
* track notifTimelineSet on MatrixClient
* stop Rooms from tracking notifTimelineSet as they don't need to
* Implement client.paginateNotifTimelineSet
* make Events store their pushActions properly
* insert live notifs directly into the notifTimelineSet in /sync, ordering by origin_server_ts.
2016-09-08 02:57:49 +01:00
Matthew Hodgson
fc495a5f1e
fix lint
2016-09-08 00:18:17 +01:00
Richard van der Hoff
6fe4dfcad0
Refactor event handling in Crypto
...
Move the event-handler registration from client.js into crypto.js
2016-09-07 23:13:22 +01:00
