643526987f
Merge branch 'master' into new-state-store
2021-01-05 21:40:39 +01:00
b311a31c9e
matrix-sdk: Bump our tokio and reqwest versions.
2021-01-05 21:39:52 +01:00
c6a80dc921
Merge branch 'master' into new-state-store
2021-01-04 17:34:33 +01:00
4c6c1d2107
matrix-sdk: Get rid of the common macros crate
...
This crate was used to support different trait bounds on WASM vs other
targets, since we only define async traits in a couple of places having
a whole crate to support this feels a bit excessive.
This patch defines a target specific super trait instead, this lowers
the compile time a couple of seconds.
2021-01-04 16:34:14 +01:00
8857335a7d
Merge branch 'crypto-improvements' into new-state-store
2020-12-22 16:18:46 +01:00
a370eb1e37
base: Re-introduce the event emitter.
2020-12-19 20:20:39 +01:00
79102b3390
crypto: Make the cancelations output only CancelContents.
2020-12-17 12:15:11 +01:00
b05fed5a3b
matrix-sdk: Fix our tests now that the state store is roughly done.
2020-12-15 10:23:31 +01:00
7198b0daba
crypto: WIP key verification request handling.
2020-12-09 17:18:23 +01:00
ce4d53a88c
examples: Feature gate the cross signing bootstrap example.
2020-11-26 14:27:11 +01:00
7ec5a5ad1a
Merge branch 'master' into crypto-improvements
2020-11-26 13:24:57 +01:00
27ecab8574
Update ruma
2020-11-25 19:01:28 +01:00
5c14910126
crypto: WIP cross signing bootstrap.
2020-10-26 16:03:59 +01:00
e737200fbe
matrix-sdk: Remove an useless import.
2020-10-13 11:55:18 +02:00
41b3b0651f
matrix-sdk: Don't use strings for the content type in the upload methods.
2020-10-13 11:00:52 +02:00
0ab12fe969
examples: Add some whitespace to the autojoin example.
2020-10-12 12:50:03 +02:00
c4ac0d0570
matrix-sdk: example: retry autojoin
2020-10-10 16:17:08 +02:00
27c6f30e0f
Merge branch 'master' into crypto-improvements
2020-10-06 16:44:11 +02:00
bc48674f9f
Merge branch 'new-sync-methods' into master
2020-10-06 16:43:41 +02:00
2ffac286ed
matrix-sdk: Switch to using an enum for the sync loop callback return value.
2020-10-06 15:04:43 +02:00
f4137c6bba
Merge branch 'master' into crypto-improvements
2020-10-06 12:23:04 +02:00
137fa9619f
matrix-sdk: Add the ability to stop the sync loop and rename the sync methods.
...
This renames our sync methods so it's clearer which one the main one is.
Syncing should be done with the sync method, if one wishes to sync only
once the sync_method is provided.
If one wishes to have a callback called with every sync the
sync_with_callback method exists, the callback now returns a boolean
that signals if the loop should be aborted. This does not mean that the
current sync request will abort, a cancelable future is still needed for
this.
2020-10-06 11:37:29 +02:00
bcdcdeb259
Merge branch 'master' into crypto-improvements
2020-10-01 12:21:45 +02:00
b58d88e0c3
Upgrade ruma
2020-10-01 11:23:26 +02:00
f3be27921c
crypto: Move the device trust state logic into the read only device.
2020-09-24 12:45:23 +02:00
428b28a985
matrix-sdk: Increase the type length limit for the wasm example.
2020-09-16 12:28:42 +02:00
e98960f30b
matrix-sdk: Add an image uploading bot to the examples.
2020-09-15 17:17:28 +02:00
fb47abcc17
Update ruma
2020-09-14 20:26:52 +02:00
cc236a8765
examples: Fix the wasm bot example.
2020-09-02 14:23:00 +02:00
977e29c3af
matrix-sdk: Fix the wasm bot example.
2020-08-26 16:19:39 +02:00
39628a308b
matrix-sdk: Allow any event content to be sent out with room_send().
2020-08-26 15:41:27 +02:00
a57c6159bd
Fix travis ci errors
...
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2020-08-21 19:11:10 +02:00
9fe0717cee
examples: Update the emoji verification example tho show a list of devices.
...
This may showcase that cross signing verification works if the other
device uploads valid signatures.
2020-08-19 14:50:35 +02:00
5040be042f
Update ruma
2020-08-15 15:17:27 +02:00
cb8d5ce8fb
Rename CustomOrRawEvent -> CustomEvent and use raw json when failed
...
When deserialization fails we fallback to providing the user with a
serde_json::RawValue, basically the json string. Ruma should handle all
events that conform to a matrix event shape correctly by either
converting them to their type or returning a custom event.
2020-08-04 17:27:57 -04:00
2bf8c99dfe
Merge branch 'master' into sas-verification
2020-08-04 11:23:24 +02:00
a3bb8a0d74
examples: Don't use a proxy for the emoji example.
2020-08-03 14:59:03 +02:00
3245fbb1c9
examples: Clean up the emoji example a bit.
2020-08-03 14:51:45 +02:00
ed1f12ce37
Run cargo fmt with merge-imports true
2020-08-02 07:46:02 -04:00
91d7a8329e
matrix-sdk: Add an example that does SAS verification.
2020-07-31 15:34:46 +02:00
71f2a042c2
Rename Stub -> Sync for all ruma events
2020-07-18 08:37:43 -04:00
ffc5204109
Fix two pattern matching related warnings
2020-07-11 20:57:01 +02:00
4ee245dcce
examples: Updat the autojoin example to use the ruma mono repo.
2020-07-10 15:30:17 +02:00
68822861d5
Rebase upstream/master into ruma-mono branch
2020-07-10 08:59:02 -04:00
eb5949dbc2
Move matrix-sdk to ruma monorepo
2020-07-10 08:59:00 -04:00
a3441429da
matrix-sdk: Add an autojoin example.
2020-07-08 20:22:50 +02:00
1174ccfc89
Merge branch 'master' into feature/display-name
2020-06-20 12:54:46 +02:00
8b77b4171a
Do wasm sepcific changes:
...
- Only use send+sync when not using wasm
- Use wasm capabale async_trait wrapper macro
- Make room and room_member specific structs always clonable
2020-06-17 18:57:39 +02:00
331cb02266
Split joined/invited users and handle removing users.
2020-06-10 18:12:27 +02:00
62e959a94d
Merge branch 'expose-send'
2020-06-02 11:20:47 +02:00
Damir Jelić
Jonas Platte
strct
Alejandro Domínguez
Tilo Spannagel
Devin Ragotzy
Denis Kasak
Marcel
Denis Kasak