David Baker
abd2ac7168
Rename backup API call in test
2018-11-20 16:34:04 +00:00
David Baker
d99a22d68d
Update to new API
...
Also fix test & remove debug logging from test
2018-11-16 14:46:18 +00:00
David Baker
907cf19f05
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-11-15 16:35:52 +00:00
David Baker
88682e1c3b
Merge pull request #780 from matrix-org/dbkr/olm_session_unwedge
...
Restart broken Olm sessions
2018-11-15 16:34:10 +00:00
David Baker
d74ed508f9
Restart broken Olm sessions
...
* Start a new Olm sessions with a device when we get an undecryptable
message on it.
* Send a dummy message on that sessions such that the other end knows
about it.
* Re-send any outstanding keyshare requests for that device.
Also includes a unit test for megolm that isn't very related but came
out as a result anyway.
Includes https://github.com/matrix-org/matrix-js-sdk/pull/776
Fixes https://github.com/vector-im/riot-web/issues/3822
2018-11-08 19:09:28 +00:00
David Baker
ff4125c11e
Remove unused stuff & comments
2018-11-05 09:39:46 +00:00
David Baker
ec8b3ae515
Lint (and also name the test right)
2018-11-02 12:33:46 +00:00
David Baker
c94382b46c
A unit test for olm
...
Megolm has plenty but none for just the olm layer by itself. I
was playing with getting session re-establishment to work and a
unit test came out.
2018-11-02 12:05:13 +00:00
David Baker
29d92d3e81
Lint
2018-10-31 20:05:21 +00:00
David Baker
c6ad0665b5
factor out duplicated test code
2018-10-31 18:03:40 +00:00
David Baker
8ab84dee16
PR feedback 1/n
2018-10-31 17:40:17 +00:00
David Baker
0e26247b53
Speed up time rather than increasing timeouts
2018-10-26 12:08:55 +01:00
David Baker
a6bf40d4e2
We can always import these now
2018-10-25 19:21:29 +01:00
David Baker
b3bb99d76a
Stop client after backup tests
2018-10-25 19:11:43 +01:00
David Baker
243bab7036
Merge branch 'dbkr/stop_devicelist' into dbkr/e2e_backups
2018-10-25 19:03:57 +01:00
David Baker
88b39f4b67
Stop devicelist when client is stopped
...
To avoid the devicelist trying to save after the client has been
stopped
Hopefully will fix random test failures on node 11.
2018-10-25 19:00:03 +01:00
David Baker
5e8061f846
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:33:48 +01:00
David Baker
4b9c6e6bd2
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
2018-10-24 19:15:04 +01:00
David Baker
3a316de9ef
Update to Olm 3 here too
2018-10-24 17:40:58 +01:00
David Baker
f165b55a1d
Merge branch 'e2e_backups' of git://github.com/uhoreg/matrix-js-sdk into uhoreg-e2e_backups
2018-10-24 17:15:36 +01:00
David Baker
b9e198c172
Oops: remove debug logging
2018-10-15 11:39:39 +01:00
Hubert Chathi
91fb7b0a7c
fix unit tests for backup recovery
2018-10-12 12:03:51 -04:00
Hubert Chathi
9b12c22823
de-lint plus some minor fixes
2018-10-12 10:38:10 -04:00
Hubert Chathi
3957006fae
Merge remote-tracking branch 'upstream/dbkr/e2e_backups' into e2e_backups
2018-10-11 14:01:26 -04:00
Bruno Windels
2ed694b041
remove supersedes OOB logic
2018-10-11 14:32:03 +02:00
Hubert Chathi
da65f43983
wrap backup sending in a try, and add delays
2018-10-10 19:31:28 -04:00
David Baker
ada4b6ef16
Lint
2018-10-09 15:46:12 +01:00
Hubert Chathi
258adda67c
retry key backups when they fail
2018-10-04 15:19:20 -04:00
David Baker
9504cbcc4f
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
2018-10-04 11:19:37 +01:00
David Baker
ce2058aea9
Merge branch 'dbkr/wasm' into dbkr/e2e_backups
2018-10-02 16:54:36 +01:00
David Baker
e9b0acaa8e
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-02 16:50:37 +01:00
Bruno Windels
5e7634506e
Merge branch 'develop' into bwindels/resynconlltoggle
2018-09-26 18:23:07 +01:00
Bruno Windels
ba39b64ced
re-enable test
2018-09-26 18:00:40 +01:00
Bruno Windels
2560ba2980
dont clear the store if its a brand new one
2018-09-26 10:37:52 +01:00
Bruno Windels
1fd8c43d94
fix tests
2018-09-25 18:50:09 +01:00
David Baker
63cc3fd890
lint
2018-09-25 18:14:11 +01:00
David Baker
c556ca40b1
Support Olm with WebAssembly
...
wasm Olm has a new interface: it now has an init method that needs
to be called and the promise it returns waited on before the Olm
module is used. Support that, and allow Crypto etc to be imported
whether Olm is enabled or not. Change whether olm is enabled to
be async since now it will be unavailable if the async module init
fails. Don't call getOlmVersion() until the Olm.init() is done.
2018-09-25 17:49:54 +01:00
David Baker
a08a3078da
Revert "room name should only take canonical alias into account"
2018-09-20 11:20:49 +01:00
Bruno Windels
574a6b68ae
Merge pull request #735 from matrix-org/bwindels/fixstalerr
...
Introduce Room.myMembership event
2018-09-19 13:35:11 +02:00
David Baker
2f4c1dfcc4
Test all 3 code paths on backup restore
2018-09-18 17:33:47 +01:00
David Baker
e4bb37b1a8
Fix lint mostly
2018-09-18 14:53:59 +01:00
David Baker
54c443ac68
Make tests pass
2018-09-18 14:48:02 +01:00
Bruno Windels
fc3a00054f
add test for new event
2018-09-17 19:33:36 +02:00
Bruno Windels
84e41c2ade
fix tests
2018-09-17 18:28:07 +02:00
Bruno Windels
b829a39cd2
fix tests
2018-09-13 09:59:20 +02:00
David Baker
72bd51f26e
Merge remote-tracking branch 'origin/develop' into uhoreg-e2e_backups
2018-09-11 12:02:47 +01:00
David Baker
a0639a32c7
Revert "Revert "Don't rely on members to query if syncing user can post to room""
2018-09-06 11:47:40 +01:00
David Baker
04ad3d7c3c
Revert "Don't rely on members to query if syncing user can post to room"
2018-09-05 18:04:19 +01:00
Bruno Windels
8b00083bca
check power levels without relying on membership
...
as this might not be known for the syncing user.
instead, add a method to room which always knows the syncing user's membership
2018-09-05 12:36:53 +02:00
Bruno Windels
3d98e324b5
Merge pull request #719 from matrix-org/bwindels/fixavatars-parttrois
...
Fixes for room.guessDMUserId
2018-09-04 18:17:39 +02:00