19741 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	9fb0db3129	Update library/ui-strings/src/main/res/values/strings.xml ... Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:07:12 +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
Hugh Nimmo-Smith	a3126b0026	Progress to status screen on failure	2022-10-18 00:35:35 +01:00
Hugh Nimmo-Smith	cf1c7515fb	Automatically try again on partial failed QR scan	2022-10-18 00:35:13 +01:00
Hugh Nimmo-Smith	8cfe6b1363	Wording updates	2022-10-17 23:46:28 +01: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	8c8190202f	Better function name	2022-10-17 17:31:14 +01:00
Hugh Nimmo-Smith	41dbdbcd7b	Lint	2022-10-17 17:30:54 +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	552fb9de9a	Improved comment around QR generation	2022-10-17 16:24:01 +01: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
Hugh Nimmo-Smith	d616251f26	Fix merge	2022-10-17 13:41:27 +01:00
Hugh Nimmo-Smith	7e24f6a2b0	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-17 13:40:42 +01:00
Onuray Sahin	d3a24fec9b	Lint fix.	2022-10-17 15:35:21 +03: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	3be4a0ca21	Remove unused val	2022-10-17 11:25:09 +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
Onuray Sahin	8547fee562	Enable qr code login by default.	2022-10-17 12:44:25 +03:00
Hugh Nimmo-Smith	a3fc785945	Fix missing param	2022-10-14 18:52:42 +01:00
Hugh Nimmo-Smith	bfe3daa37f	Fix compile error from bad merge	2022-10-14 17:25:06 +01:00
Hugh Nimmo-Smith	fdc55965ca	Linting	2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith	dc9b41d19a	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-14 17:12:08 +01:00
Onuray Sahin	6c10a9bf2d	Code review fixes.	2022-10-14 18:10:18 +03:00
Onuray Sahin	e83bdc3779	Use correct homeserver url to check qr code login support.	2022-10-14 17:46:14 +03:00
Hugh Nimmo-Smith	6426ff40d3	Linting	2022-10-14 14:18:50 +01:00
Hugh Nimmo-Smith	411b766890	Refactor to camelcase	2022-10-14 14:17:19 +01:00