5571 Commits

Author	SHA1	Message	Date
Benoit Marty	9122d96fc6	Merge remote-tracking branch 'origin/develop' into develop	2022-10-19 17:17:33 +02:00
Benoit Marty	36eb538a93	Version++	2022-10-19 17:17:21 +02:00
Johannes Marbach	451f5f824a	Merge pull request #7369 from vector-im/feature/hughns/qr_code_login ... Implement logic for sign in with QR	2022-10-19 17:10:19 +02:00
Hugh Nimmo-Smith	4f652f1026	Request changes from review	2022-10-19 09:12:09 +01:00
Benoit Marty	f5fe5cce62	Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null ... Handle properly when getUser returns null - prefer using getUserOrDefault	2022-10-19 08:40:44 +02:00
Florian Renaud	fbf242756e	Allow additional content when sending an event	2022-10-18 21:08:08 +02:00
Hugh Nimmo-Smith	67be8c3c40	The one that got away	2022-10-18 12:44:05 +01:00
Florian Renaud	16c27ba174	Voice Broadcast - Get voice messages events related to a given VB	2022-10-18 13:41:05 +02:00
Florian Renaud	5f35926ce6	Voice Broadcast - Hide related voice message events	2022-10-18 13:41:04 +02:00
Florian Renaud	ce14270fab	Introduce MessageAudioEvent	2022-10-18 13:41:04 +02:00
Hugh Nimmo-Smith	f7e0a19833	Remove redundant annotations	2022-10-18 12:29:48 +01:00
Hugh Nimmo-Smith	811d6d87ae	Reuse getDecimalCodeRepresentation from SAS instead of duplicating code	2022-10-18 12:23:21 +01:00
Hugh Nimmo-Smith	a83fb8bf83	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt ... Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:09:17 +01:00
Hugh Nimmo-Smith	8530f8f280	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt ... Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:09:06 +01:00
Hugh Nimmo-Smith	0d1df3f66e	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt ... Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:08:09 +01:00
Hugh Nimmo-Smith	376cd1cb36	Missing throws	2022-10-18 09:34:28 +01:00
Hugh Nimmo-Smith	57a8dd4a1f	Whitespce	2022-10-18 09:31:13 +01:00
Hugh Nimmo-Smith	a1d2944c32	Always check master key when provided by verifying device	2022-10-18 09:08:40 +01:00
Hugh Nimmo-Smith	f297117df2	Use mutex	2022-10-18 08:48:28 +01:00
Hugh Nimmo-Smith	8a62dfb34a	Lint	2022-10-18 00:35:43 +01:00
Florian Renaud	fb9c747a20	Reformat and add trailing commas	2022-10-17 22:33:43 +02:00
Florian Renaud	33a021c8ed	Add sdk entry to attach reference to the outgoing events	2022-10-17 22:33:42 +02:00
Florian Renaud	dbc61971df	Reduce duplicated code	2022-10-17 22:33:42 +02:00
Hugh Nimmo-Smith	6d17d51fe9	remove nullability	2022-10-17 17:36:35 +01:00
Hugh Nimmo-Smith	8f4d998362	Lint	2022-10-17 17:33:43 +01:00
Hugh Nimmo-Smith	d3e61a23a9	Fix generator	2022-10-17 17:29:45 +01:00
Hugh Nimmo-Smith	c3669318c1	Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login	2022-10-17 16:37:35 +01:00
Hugh Nimmo-Smith	1863e4c3ef	Use unstable prefixes	2022-10-17 16:34:51 +01:00
Onuray Sahin	b2dc0b33b5	Implement try again button action.	2022-10-17 18:32:35 +03:00
Hugh Nimmo-Smith	3d37e0b2a5	Fix enum JsonClass generateAdapter = false	2022-10-17 16:19:03 +01:00
Hugh Nimmo-Smith	623277e31f	Lint	2022-10-17 16:13:49 +01:00
Hugh Nimmo-Smith	e877feed6e	Add @JsonClass to all enums	2022-10-17 16:06:08 +01:00
Hugh Nimmo-Smith	29065b819f	Remove unused class	2022-10-17 16:03:47 +01:00
Hugh Nimmo-Smith	e01ee619d3	Refactor error handling and report E2EE errors	2022-10-17 16:02:25 +01:00
Onuray Sahin	47c87141b2	Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui ... QR Code Login UI	2022-10-17 17:20:07 +03:00
Benoit Marty	997341b962	Merge pull request #7282 from vector-im/feature/bma/remove_original_event ... Stop using `original_event` field	2022-10-17 14:43:22 +02:00
Hugh Nimmo-Smith	d616251f26	Fix merge	2022-10-17 13:41:27 +01:00
Hugh Nimmo-Smith	e89774e160	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith	eb30ef166a	Improve 404 handling	2022-10-17 12:32:40 +01:00
Hugh Nimmo-Smith	1976451c81	Lint	2022-10-17 12:23:14 +01:00
Onuray Sahin	91bb86d3c6	Code review fixes.	2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith	fb86ab70a2	Comments and error mapping	2022-10-17 12:05:32 +01:00
Hugh Nimmo-Smith	4306c57236	Thread safe use of OlmSAS	2022-10-17 12:01:12 +01:00
Hugh Nimmo-Smith	506fa729ea	Cleanup	2022-10-17 11:50:56 +01:00
Hugh Nimmo-Smith	48de8f4e34	Fix bad merge	2022-10-17 11:48:35 +01:00
Hugh Nimmo-Smith	33be5c257d	Refactor into dedicated files and companion objects	2022-10-17 11:24:48 +01:00
Hugh Nimmo-Smith	ed6bc01bef	Resolve TODO	2022-10-17 10:54:28 +01:00
Hugh Nimmo-Smith	d979b50b2c	Logging cleanup	2022-10-17 10:52:24 +01:00
Benoit Marty	b7570a3c5e	Fix compilation error	2022-10-17 11:31:48 +02:00
Benoit Marty	0cdc21649e	Fix unused import	2022-10-17 11:27:40 +02:00