3045 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	38c1ef3eb6	Fix lint issue	2020-02-26 16:08:34 +01:00
Benoit Marty	674450ef29	Merge pull request #1076 from vector-im/feature/fullscreen_avatar ... Display avatar in fullscreen.	2020-02-26 16:06:13 +01:00
Benoit Marty	5e775298a7	Merge pull request #1081 from vector-im/feature/fix_redacted_event_format ... Fix redacted event format on room overview.	2020-02-26 15:57:10 +01:00
onurays	93a687a172	Code review fixes.	2020-02-26 17:55:23 +03:00
onurays	04726a1ace	Fix redacted event format on room overview. ... Fixes #758	2020-02-26 16:51:01 +03:00
Onuray Sahin	d2efe0e10c	Merge branch 'develop' into feature/fullscreen_avatar	2020-02-26 16:23:02 +03:00
Benoit Marty	b7cf7e06a7	Merge pull request #1015 from vector-im/feature/new_signin_passphrase ... Feature/new signin passphrase	2020-02-26 13:56:31 +01:00
onurays	536dce7929	Code review fixes.	2020-02-26 15:30:03 +03:00
onurays	56fc91a8c3	Code review fixes.	2020-02-26 15:26:53 +03:00
Benoit Marty	6622e0daca	Code quality	2020-02-26 12:43:41 +01:00
Benoit Marty	f35b0660ca	Rename constant for code readability	2020-02-26 12:37:36 +01:00
Valere	9d1718cda8	post merge clean	2020-02-26 12:20:03 +01:00
Valere	f7c128be3d	Fix tests	2020-02-26 12:20:03 +01:00
Valere	c80fb52410	dead code	2020-02-26 12:20:03 +01:00
Valere	32389e1291	Remove wizard stuff	2020-02-26 12:20:03 +01:00
Valere	99f9a9817e	Use human readable error (not technical)	2020-02-26 12:20:03 +01:00
Valere	b4a783198b	code review	2020-02-26 12:20:03 +01:00
Valere	0cfc9451ca	Cleaning	2020-02-26 12:20:03 +01:00
Valere	4b75baf772	Fix / trust was not properly updated after 4S restore	2020-02-26 12:20:03 +01:00
Valere	c579de1033	Fix / Test crash when crypto DB closed ... Quick Work around	2020-02-26 12:20:03 +01:00
Valere	d537abc522	Fix / sign current device after entering xsigning passphrase	2020-02-26 12:20:03 +01:00
Valere	030f027516	Fixes #1051 ... XSigning | Self verification Empty bottomsheet	2020-02-26 12:20:03 +01:00
Valere	cbd7c1aa63	Fix / Bad ordering of active sessions	2020-02-26 12:20:03 +01:00
Valere	bdb1df75d4	Check trust on crypto thread	2020-02-26 12:20:03 +01:00
Valere	817dc19b9a	Cleaning	2020-02-26 12:20:03 +01:00
Valere	f9be4fa2bd	Fixes #1047	2020-02-26 12:20:03 +01:00
Valere	412aed6dcb	Fix / Update title before return	2020-02-26 12:20:03 +01:00
Valere	9fc44c11de	Fixes #937 ... Disabling bounds change animation, as it's messing with fragment change apparition and expanded state of bottomsheet	2020-02-26 12:20:03 +01:00
Valere	bf23094158	Fix / Green shield in conclusion title when verified from private keys	2020-02-26 12:20:03 +01:00
Valere	94d36e0c85	cleaning jni	2020-02-26 12:20:03 +01:00
Valere	0064934db9	Changed Encryption algorithm of 4S	2020-02-26 12:20:03 +01:00
Valere	e2e4ddf5ba	Post rebase fix	2020-02-26 12:20:03 +01:00
Valere	9a08f5ec4e	WIP / Verify from passphrase UX	2020-02-26 12:19:31 +01:00
Valere	cb669ad881	4S Activity WIP	2020-02-26 12:15:59 +01:00
Valere	3dc89c8d87	Update Self Verification BottomSheet for quads	2020-02-26 12:15:59 +01:00
Benoit Marty	cb73955946	Merge pull request #1050 from vector-im/feature/fix_some_perf ... Feature/fix some perf	2020-02-26 12:02:36 +01:00
ganfra	bfe15555a1	Update changes	2020-02-26 11:51:05 +01:00
ganfra	bddeb6cb72	Clean files	2020-02-26 11:50:41 +01:00
ganfra	d57f6838e9	Remove decryption from room summary mapper and make TimelineEventDecryptor scoped to session	2020-02-26 11:50:41 +01:00
ganfra	cf8ffa3a7a	Force trust task on crypto dispatcher to use cached realm from crypto store	2020-02-26 11:49:08 +01:00
Benoit Marty	40b4db4a64	Merge pull request #1060 from vector-im/feature/data_class_cleanup ... Data class cleanup	2020-02-26 10:57:10 +01:00
Benoit Marty	246b39786c	Merge pull request #1073 from vector-im/feature/improve_api ... Improve api of CreateRoomParams	2020-02-26 10:55:48 +01:00
onurays	1a273407de	Display avatar in fullscreen.	2020-02-26 12:12:49 +03:00
Benoit Marty	633f9d8522	ktlint	2020-02-26 09:55:57 +01:00
Benoit Marty	076ac23b38	Modification done by AndroidStudio 3.6	2020-02-26 07:59:54 +01:00
Benoit Marty	67180fd8db	New direct chat: selecting several participants was not adding the room to the direct chats list	2020-02-26 07:38:10 +01:00
Benoit Marty	fc95bf4926	Improve CreateRoomParams API: update some API for better chaining of builder like methods (#1070)	2020-02-26 07:32:22 +01:00
Benoit Marty	e73f138151	Improve CreateRoomParams API: update Javadoc and ensure the return values will not be discarded (#1070)	2020-02-26 07:17:25 +01:00
Benoit Marty	30432cd3f4	Merge pull request #1069 from vector-im/feature/fix_dm ... Fix dm chips	2020-02-25 19:28:46 +01:00
Benoit Marty	1072060cbb	New direct chat: selecting a participant sometimes results in two breadcrumbs (#1022)	2020-02-25 19:00:38 +01:00