3015 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Benoit Marty	a55e0f1af4	Fix crash - workaround	2020-02-25 18:17:40 +01:00
Benoit Marty	b95dfa4473	Create getBestName method for User	2020-02-25 18:14:02 +01:00
Benoit Marty	ec0cba2b23	Merge pull request #1067 from vector-im/feature/roomId ... Display internal id of a room section in room profile	2020-02-25 12:22:14 +01:00
Benoit Marty	cfe9c4bb41	Display internal id of a room section in room profile, with copy to clipboard action, only in developer mode	2020-02-25 12:21:04 +01:00
Benoit Marty	68400cce03	Merge pull request #1049 from vector-im/feature/fix_invites ... Feature/fix invites	2020-02-25 11:39:35 +01:00
Benoit Marty	17e028178e	Code robustness (avoid using !!)	2020-02-25 11:20:11 +01:00
ganfra	19b9617a09	Invite: fix inviterId being overrided	2020-02-25 10:53:47 +01:00
Benoit Marty	08e4b4473c	Disable manual rules now checked by ktlint	2020-02-25 09:57:12 +01:00
Benoit Marty	b9b921a4df	Code quality	2020-02-25 09:53:17 +01:00
ganfra	483256093a	Invite: fix room member not saved	2020-02-24 18:27:18 +01:00
Benoit Marty	d710a59554	Update change log	2020-02-24 17:44:51 +01:00
Benoit Marty	1023982858	Code readability	2020-02-24 17:40:28 +01:00
Benoit Marty	9c566b19f7	Ensure all eventId start with $, even ids for local echo	2020-02-24 17:35:43 +01:00
ganfra	b694721728	Update CHANGES	2020-02-24 17:33:40 +01:00
ganfra	8b0305c91d	Clean code	2020-02-24 17:33:40 +01:00
ganfra	133d8d7f14	RoomList: fix joining/rejecting state	2020-02-24 17:33:40 +01:00
ganfra	9cdb1da614	Start fixing notif for invites	2020-02-24 17:33:40 +01:00
ganfra	981c9ac4ac	Invite sync: assign eventId and remove the primaryKey constraint	2020-02-24 17:33:40 +01:00
Benoit Marty	3e8a0f7252	Merge pull request #1044 from vector-im/feature/fix_big_image_rotation ... Use exif info of the image for correct rotation.	2020-02-24 17:30:33 +01:00
Benoit Marty	281620b88d	Merge pull request #1048 from vector-im/feature/profile_share_actions ... Share action is added to room profile and room member profile	2020-02-24 17:29:17 +01:00
Benoit Marty	c6b3b1e648	Fix bug on test	2020-02-24 17:27:04 +01:00
Benoit Marty	96af1957f9	Fix bug on progress step, found by integration test testBackupWithPassword()	2020-02-24 16:27:58 +01:00
Benoit Marty	b680e24938	Fix some tests	2020-02-24 16:16:37 +01:00
onurays	dec62a893e	Code review fixes.	2020-02-24 18:06:59 +03:00
onurays	b3d4747d97	Code review fixes.	2020-02-24 17:35:57 +03:00
onurays	1124aa25fd	Code review fixes.	2020-02-24 17:22:07 +03:00
Benoit Marty	b3c8b5526d	Each session now have it's proper crypto store	2020-02-24 15:03:12 +01:00
Benoit Marty	1e44e77503	Make code robust to int received instead of boolean ... https://github.com/matrix-org/synapse/issues/6977	2020-02-24 14:42:47 +01:00
Valere	964b611f4e	Merge pull request #1053 from vector-im/feature/fix_712 ... Fixes #712	2020-02-24 14:07:35 +01:00
Valere	3e587af163	klint	2020-02-24 14:07:15 +01:00