1224 commits

Author	SHA1	Message	Date
Benoit Marty	3ee5a7f54d	Better code	2019-12-20 10:55:08 +01:00
Benoit Marty	8dce98c538	Autocompletion: group (including pills for groups)	2019-12-20 02:54:48 +01:00
Benoit Marty	543c07fd69	Render pills for room links	2019-12-20 01:23:45 +01:00
Benoit Marty	05a788453f	More generic name	2019-12-20 00:47:47 +01:00
Benoit Marty	92f43a591a	Autocompletion for room canonical alias	2019-12-20 00:38:42 +01:00
Benoit Marty	d342356f29	Add missing state events to the list (not sure about the side effects)	2019-12-19 19:48:30 +01:00
Benoit Marty	07817b69c2	Rename some event type	2019-12-19 19:46:09 +01:00
Benoit Marty	e73970d61b	Render aliases and canonical alias change in the timeline	2019-12-19 19:39:35 +01:00
ganfra	55748a4af4	Merge branch 'develop' into feature/initial_sync	2019-12-19 17:49:45 +01:00
ganfra	a6afd2e904	Timeline: handle failure when navigating to an unknown event (+ clean some files)	2019-12-19 16:10:59 +01:00
Benoit Marty	156cc1aa4a	Import Strings from Riot	2019-12-19 15:50:18 +01:00
ganfra	a4ea9a09ad	Room factory: add scope to avoid recreate all the dependencies	2019-12-19 13:41:57 +01:00
Benoit Marty	4b0dfa49f4	Limit sticker size in the timeline	2019-12-19 11:44:07 +01:00
Valere	94125a0215	Merge branch 'develop' into cross_signing	2019-12-19 10:15:47 +01:00
ganfra	c8f0c83cd3	Timeline: don't retry automatically to avoid totally blocking pagination	2019-12-19 09:57:49 +01:00
ganfra	7697278bb2	LiveObservers: launch directly coroutines	2019-12-18 16:59:45 +01:00
ganfra	4c88c12cfe	Initial sync, start the sync thread or the sync service	2019-12-17 18:46:19 +01:00
Benoit Marty	79f11ad686	Prevent crash when mimetype is null	2019-12-17 17:49:28 +01:00
Benoit Marty	7fa76b9d35	Prevent crash when opening unknown room, which should not happen...	2019-12-17 16:35:04 +01:00
Benoit Marty	42cdb1db11	Fix crash reported by rageshake: writeToFile may throw exceptions	2019-12-17 12:26:45 +01:00
ganfra	2316c98a65	Merge branch 'develop' into feature/initial_sync	2019-12-16 19:11:04 +01:00
Valere	89b414e8fe	Merge branch 'develop' into dm_verif_incoming_timeline	2019-12-16 15:30:39 +01:00
Benoit Marty	e2b4899b36	Internal review	2019-12-16 15:21:24 +01:00
ganfra	abf0796794	Room alias and matrix.to link: we can now open a room though roomAlias as long as it's a joined one	2019-12-16 15:16:46 +01:00
ganfra	02febfb01b	Start handling room alias	2019-12-16 15:09:41 +01:00
Benoit Marty	f14f1db0e0	Merge pull request #774 from vector-im/feature/breadcrumbs_fixes ... Fix various UI issues	2019-12-16 15:00:21 +01:00
Benoit Marty	9fc3093c2c	Fix issues...	2019-12-16 12:39:51 +01:00
Benoit Marty	cecef5b8da	Use id to get first letter, if display name is empty	2019-12-16 10:56:25 +01:00
Benoit Marty	c9ed95ed21	MatrixItem: create extension and check ids	2019-12-16 10:50:48 +01:00
Benoit Marty	3e4b07cec3	Do not display " (IRC)") in display names	2019-12-14 10:19:11 +01:00
Benoit Marty	fbb1846694	Render default room name when it starts with an emoji (#477)	2019-12-13 21:23:18 +01:00
Benoit Marty	b435212c87	Use same default room colors than Riot-Web ... And create MatrixItem	2019-12-13 20:50:32 +01:00
ganfra	5dd46e82d7	Sync: make only one big transaction to avoid having bad states	2019-12-13 18:21:44 +01:00
Valere	3727affc15	cleaning	2019-12-13 18:00:04 +01:00
Valere	3953022258	Merge branch 'cross_signing' into dm_verif_incoming_timeline	2019-12-13 16:51:53 +01:00
Valere	289c03e724	Code review	2019-12-13 16:41:55 +01:00
ganfra	fe2be90002	Sync: use the CoroutineSequencer but need more tests	2019-12-13 15:37:38 +01:00
Benoit Marty	f073342954	Cleanup	2019-12-13 15:32:57 +01:00
Benoit Marty	e60bda7806	Better archi, better code, less bug...	2019-12-13 15:16:26 +01:00
Valere	210dcca0ee	Fix / Handling multi open sessions	2019-12-13 11:22:39 +01:00
Benoit Marty	050519e998	Soft Logout - add a TODO, waiting for Synapse bugfix	2019-12-13 09:22:24 +01:00
Benoit Marty	1af44ce5f7	cleanip	2019-12-13 01:37:29 +01:00
Benoit Marty	4e74b545ad	SoftLogout: recovery with SSO	2019-12-13 01:25:58 +01:00
Benoit Marty	954019547d	Soft Logout - update comment	2019-12-12 23:25:14 +01:00
Benoit Marty	a464c910f8	Fix crash with Realm	2019-12-12 19:43:16 +01:00
Valere	975de1dbed	Cleaning / klint	2019-12-12 18:48:57 +01:00
Benoit Marty	d69881f321	cleanup	2019-12-12 17:41:16 +01:00
Valere	dedc622140	Merge branch 'sdk_reference_aggregation' into dm_verif_incoming_timeline	2019-12-12 15:55:01 +01:00
Benoit Marty	a5af949c15	SoftLogout: Store the info that the token is not valid anymore for a faster startup	2019-12-12 15:32:52 +01:00
Valere	9842cac504	More explicit val naming	2019-12-12 15:29:56 +01:00
Valere	35404b9a7f	Fix merge	2019-12-12 15:05:13 +01:00
Valere	0afcb60e7d	fix rebase	2019-12-12 14:31:01 +01:00
ganfra	eab94b4f03	Sequencer: handle cancellation	2019-12-12 14:30:40 +01:00
Valere	cb595177a9	Fix test compilation	2019-12-12 13:37:17 +01:00
Valere	cb4d52c9fb	Aggregate Event References for DM verifications	2019-12-12 13:37:17 +01:00
Valere	d0a3b4663e	FIx / room transport was not updating state	2019-12-12 13:37:17 +01:00
Valere	f53b99a423	rebase	2019-12-12 13:37:17 +01:00
Valere	6da0693488	Convert KeyVerificationStart to data class	2019-12-12 13:37:17 +01:00
Valere	62f0c6edc0	Fix / Use transport to start verification	2019-12-12 12:04:38 +01:00
Valere	e71ad0e515	Simple strategy to Ignore old verification messages	2019-12-12 12:03:59 +01:00
Valere	553604423e	Support verification using room transport	2019-12-12 12:03:42 +01:00
Valere	be723256d3	FIx / room transport was not updating state	2019-12-12 10:49:42 +01:00
Valere	819d7182bb	rebase	2019-12-12 10:49:42 +01:00
Valere	0a2ffdbdf1	Convert KeyVerificationStart to data class	2019-12-12 10:49:42 +01:00
Valere	7fc57bdf9b	Fix / Use transport to start verification	2019-12-12 10:49:42 +01:00
Valere	d370f6d7c8	Simple strategy to Ignore old verification messages	2019-12-12 10:49:42 +01:00
Valere	46ef442139	cleaning	2019-12-12 10:49:42 +01:00
Benoit Marty	5f3dc73440	Code review	2019-12-12 10:49:42 +01:00
Valere	6137a88a6f	Support verification using room transport	2019-12-12 10:49:42 +01:00
Valere	82af848c33	Fix / Verification Request Local Echo	2019-12-12 10:27:58 +01:00
ganfra	6b61c95843	Coroutines: introduce a sequencer	2019-12-11 20:39:07 +01:00
Benoit Marty	261b4be287	Follow naming convention	2019-12-11 18:51:46 +01:00
Benoit Marty	205fc0d9d6	Soft Logout - issue with device display name	2019-12-11 18:49:44 +01:00
Benoit Marty	7699560458	Soft Logout - WIP	2019-12-11 18:35:30 +01:00
Benoit Marty	284dc8602f	InvalidToken: Regular Signed out screen	2019-12-11 18:34:21 +01:00
Benoit Marty	29087d4a87	InvalidToken: Rework MainActivity args	2019-12-11 18:34:21 +01:00
Benoit Marty	18649ebddb	InvalidToken: notify the app - WIP	2019-12-11 18:34:21 +01:00
Benoit Marty	d5935a13ac	MatrixError: add some MatrixError from the spec and copy paste documentation	2019-12-11 18:34:21 +01:00
Benoit Marty	670d4dc34e	MatrixError: rename the constants to follow the spec	2019-12-11 18:34:21 +01:00
Benoit Marty	5435a1739e	SoftLogout: parse the parameter from server response	2019-12-11 18:34:21 +01:00
Valere	a673bf092d	Show untrusted conclusions	2019-12-11 18:19:32 +01:00
Valere	0776a301ea	Incoming DM verification handling in timeline	2019-12-11 16:49:34 +01:00
ganfra	3a269be2ef	Sync: fix crash on gplay flavor and reschedule when no network instead of showing a potential notification all the time	2019-12-11 16:24:30 +01:00
Valere	02f03e6b23	Fix test compilation	2019-12-11 16:00:53 +01:00
Valere	8305ce67dd	Aggregate Event References for DM verifications	2019-12-11 14:44:31 +01:00
ganfra	5338f93852	Sync: use a foreground service for initialSync.	2019-12-10 19:52:12 +01:00
Valere	73f0132d5d	FIx / room transport was not updating state	2019-12-10 16:37:54 +01:00
Valere	c462d15bcf	rebase	2019-12-10 14:23:56 +01:00
Valere	3cdd373368	Convert KeyVerificationStart to data class	2019-12-10 11:14:52 +01:00
Valere	2aa9c3ea22	Fix / Use transport to start verification	2019-12-10 11:14:52 +01:00
Valere	bbd9738452	Simple strategy to Ignore old verification messages	2019-12-10 11:14:52 +01:00
Valere	36c5566b07	cleaning	2019-12-10 11:14:52 +01:00
Benoit Marty	ce63332a2f	Code review	2019-12-10 11:14:52 +01:00
Valere	26b4b6e194	Support verification using room transport	2019-12-10 11:14:20 +01:00
Benoit Marty	3ac53d20e9	Bugfix: react several times with the same reaction was possible (was a TODO).	2019-12-10 01:05:20 +01:00
ganfra	9a01b4ace9	Make it through bunch of classes removing potential leaks	2019-12-09 17:41:29 +01:00
Benoit Marty	8b1701e537	Merge pull request #738 from vector-im/feature/ban_reason ... Displaay ban and other membership events reason	2019-12-09 14:53:06 +01:00
Benoit Marty	41d1b77370	Merge pull request #749 from vector-im/feature/hs_discovery ... Support entering a RiotWeb client URL instead of the homeserver URL	2019-12-09 14:10:55 +01:00
Benoit Marty	2f26f4b8bb	Add default value (fix test compilation issue)	2019-12-09 14:09:03 +01:00
Benoit Marty	6d82ac7c59	Add default param values	2019-12-09 14:09:03 +01:00
Benoit Marty	57354cbd69	Add reason to slash commands	2019-12-09 14:09:03 +01:00
Benoit Marty	d28700e2bf	Add reason for all membership events (https://github.com/matrix-org/matrix-doc/pull/2367)	2019-12-09 14:08:06 +01:00
Benoit Marty	18beef14cf	"ban" event are not rendered correctly (#716)	2019-12-09 14:08:06 +01:00
Benoit Marty	e73923dca3	Merge pull request #741 from vector-im/feature/breadcrumbs ... Breadcrumbs	2019-12-09 14:06:27 +01:00
Benoit Marty	94afd3e66d	Add example of config without default homeserver url	2019-12-07 11:05:18 +01:00
Benoit Marty	5f540a5b45	Support entering a RiotWeb client URL instead of the homeserver URL during connection (#744)	2019-12-06 23:46:40 +01:00
Valere	8e3e9876b8	Fixes #739	2019-12-06 10:31:40 +01:00
Benoit Marty	9a4d8f87f6	Breadcrumbs: auto-review	2019-12-05 22:38:49 +01:00
Benoit Marty	0768bd5c88	Breadcrumbs: nicer algorithm	2019-12-05 22:05:37 +01:00
Benoit Marty	65333e6031	Cleanup some Realm queries	2019-12-05 21:49:01 +01:00
Benoit Marty	849e7c613c	Breadcrumbs: live update in correct order	2019-12-05 21:27:56 +01:00
Benoit Marty	ad4d5e5c02	Breadcrumbs: limit number to 20	2019-12-05 17:43:23 +01:00
ganfra	eb9775e307	Fix some crypto realm issues	2019-12-05 17:14:56 +01:00
ganfra	aa9d66b991	Allow returning a value from an async transaction	2019-12-05 17:14:38 +01:00
Benoit Marty	4ff12605e9	Breadcrumbs: notify viewed rooms	2019-12-05 16:06:47 +01:00
Benoit Marty	cec08a20e5	Handle breadcrumbs from account data	2019-12-05 12:13:45 +01:00
Benoit Marty	f31c1b69cb	Remove delay when waiting for first sync to finish and add number of sent keys in the log	2019-12-04 16:52:55 +01:00
Benoit Marty	bdb9d2fbb8	Improve and cleanup OneTimeKey uploader ... Fix boolean reset if request fails Implement https://github.com/matrix-org/matrix-js-sdk/pull/493	2019-12-04 16:34:25 +01:00
Benoit Marty	9fb50dde32	Merge pull request #726 from vector-im/feature/sign_x_stabilization ... Registration stabilization	2019-12-04 16:26:48 +01:00
Benoit Marty	a145aae0aa	Avoid using !!	2019-12-04 15:38:16 +01:00
Benoit Marty	3623072f08	Attempt to properly cancel the crypto module when user signs out (#724) ... Attempt to properly cancel the crypto module when user signs out (#724)	2019-12-04 15:38:16 +01:00
Benoit Marty	e7a47ae32a	Some cleanup	2019-12-04 11:42:18 +01:00
ganfra	0376de08f4	Clean files	2019-12-04 11:41:54 +01:00
ganfra	90c472fef9	Read marker: fix mark all as read	2019-12-04 11:41:54 +01:00
ganfra	64d73ae8e6	Read marker: handle the jump to read marker	2019-12-04 11:41:54 +01:00
ganfra	d9982076f9	Read marker: continue rework [WIP]	2019-12-04 11:39:51 +01:00
ganfra	5e07e96bdb	Read marker: start reworking how we manage it [WIP]	2019-12-04 11:33:06 +01:00
Benoit Marty	998d9f2c59	Bugfix: Text after the last pill was not send	2019-12-03 14:48:41 +01:00
Benoit Marty	3c6eb4bccf	Rework FilterEntityQueries to fix issue of ghost Realm reference	2019-12-03 11:10:43 +01:00
Benoit Marty	49178dc633	Reduce some log level	2019-12-03 11:10:43 +01:00
Benoit Marty	490ce4b51d	Fix issue of closing Realm in another thread (#725)	2019-12-03 10:05:10 +01:00
Benoit Marty	5b63856d96	Add log to detect if a realm instance is not properly closed	2019-12-02 18:33:31 +01:00
Benoit Marty	538c4d1a64	typo	2019-12-02 18:15:21 +01:00
Benoit Marty	1cadbb8eed	Ensure credentials can be stored, even if they already exist	2019-12-02 13:48:20 +01:00
Benoit Marty	3f4f7457c7	Merge pull request #689 from vector-im/feature/signin_signup ... Login and Registration	2019-12-02 13:47:28 +01:00
Benoit Marty	f11cd47df3	Pills: cleanup	2019-11-29 13:27:26 +01:00
Benoit Marty	f984758d37	Pills: Daggerization	2019-11-29 13:27:26 +01:00
Valere	97766404d6	klint	2019-11-29 13:27:26 +01:00
Valere	38b93c527b	Ensure received pills spans do not overlap	2019-11-29 13:27:26 +01:00
Valere	62bae67080	Code review	2019-11-29 13:27:26 +01:00
Valere	2a4cdec020	klint cleaning	2019-11-29 13:27:26 +01:00
Valere	6bd7257cf2	Send mention pills from composer	2019-11-29 13:27:26 +01:00
Benoit Marty	33925fcf57	Login screens: fix crash on back navigation	2019-11-28 12:09:28 +01:00
Benoit Marty	bb1c988a49	Login screens: Update the local pendingSessionData synchronously, store asynchronously	2019-11-27 16:36:35 +01:00
Benoit Marty	f063abe068	Login screens: keep PendingSessionData member up to date	2019-11-27 16:15:51 +01:00
Benoit Marty	db87d8f644	Login screens: Realm migration for Auth DB	2019-11-27 15:52:02 +01:00
Benoit Marty	fd90f3b9fc	Login screens: reset SDK when home server url is deleted	2019-11-27 15:08:36 +01:00
Benoit Marty	aa51764068	Login screens: save isRegistrationStarted in DB	2019-11-27 15:04:00 +01:00
Benoit Marty	0a19ded167	Login screens: extract some classes	2019-11-27 14:34:07 +01:00
Benoit Marty	2e3763e8b4	Login screens: persist all data during login or registration	2019-11-27 14:26:06 +01:00
Benoit Marty	0c4e0890b1	Use Realm.use { }	2019-11-27 10:49:33 +01:00
Benoit Marty	fbde8d7d18	ktlint	2019-11-26 18:04:42 +01:00
ganfra	ab4cab05cf	Room profile: continue working on UI	2019-11-26 13:22:07 +01:00
Benoit Marty	3eb2e1655f	Login screens: ensure homeserver version is supported - fix bug for SSO	2019-11-26 12:16:39 +01:00
Benoit Marty	9b207dd5dc	Login screens: ensure homeserver version is supported	2019-11-26 11:39:33 +01:00
Benoit Marty	a9526cdd92	Login screens: use homeserver and identity server Uri provided along with the credential is any	2019-11-25 18:32:24 +01:00
Benoit Marty	ab4d42fb20	Login screens: mutualize the code which create session from the credentials	2019-11-25 18:16:57 +01:00
Benoit Marty	6cb3c222a9	Login screens: handle mandatory dummy stage automatically	2019-11-25 16:47:17 +01:00
Benoit Marty	f84ec08847	Code cleanup, restore comment, and fix regression on delay	2019-11-25 14:11:38 +01:00
ganfra	9d0188cbf1	Create user from userId during initialSync	2019-11-22 20:28:52 +01:00
ganfra	73462a3045	Clean some coroutine code	2019-11-22 20:04:11 +01:00
Benoit Marty	91fcf428dd	Login screens: login with unknown email	2019-11-22 14:21:14 +01:00
Benoit Marty	8de1fa835b	Improve M_LIMIT_EXCEEDED error rendering	2019-11-22 12:15:19 +01:00
Benoit Marty	49f7ce3554	Login screens: better API	2019-11-22 12:15:19 +01:00
Benoit Marty	a3111dc2d8	Login screens: rename a few classes and packages	2019-11-22 12:15:19 +01:00
Benoit Marty	be95542110	Login screens: dummy stage shoud not be mandatory	2019-11-22 12:15:19 +01:00
Benoit Marty	6723a566c2	Login screens: refacto: create an AuthenticationWizard	2019-11-22 12:15:19 +01:00
Benoit Marty	90027cc4d5	Login screens: reset password WIP	2019-11-22 12:15:19 +01:00
Benoit Marty	42c5adf08d	ktlint	2019-11-22 12:15:19 +01:00
Benoit Marty	491a38a79f	Login screens: send again 3pid	2019-11-22 12:15:19 +01:00
Benoit Marty	1a603742d0	Cleanup	2019-11-22 12:15:19 +01:00
Benoit Marty	dd44078297	Login screens: fix several issue with check email screen	2019-11-22 12:15:19 +01:00
Benoit Marty	5770023593	Login screens: code cleanup	2019-11-22 12:15:19 +01:00
Benoit Marty	2e4c3f850a	Cleanup	2019-11-22 12:15:19 +01:00
Benoit Marty	127916a8d9	Login screens: add MSISDN	2019-11-22 12:15:19 +01:00
Benoit Marty	248a584e1a	Login screens: Add Msisdn - WIP	2019-11-22 12:15:19 +01:00
Benoit Marty	b8a3ad0c43	Login screens: Wait for email validation screen	2019-11-22 12:15:19 +01:00
Benoit Marty	1f161b7e23	Login screens: Add 3Pid step 1	2019-11-22 12:15:19 +01:00
Benoit Marty	20ad3abb60	Login screens: set initial device name	2019-11-22 12:15:19 +01:00
Benoit Marty	1dc7dfc896	Login screens: registration fallback	2019-11-22 12:15:19 +01:00
Benoit Marty	1c03163a33	Login screens: prepare email and msisdn	2019-11-22 12:15:19 +01:00
Benoit Marty	9aa270c7ad	Login screens: Perform dummy action when user does not want to enter an email -> account created!	2019-11-22 12:15:19 +01:00
Benoit Marty	3f80076fb1	Login screens: Terms step for registration	2019-11-22 12:15:19 +01:00
Benoit Marty	dfbf448bb7	Login screens: Captcha step for registration	2019-11-22 12:15:19 +01:00
Benoit Marty	41ac2c6d70	Login screens: Registration WIP	2019-11-22 12:15:19 +01:00
Benoit Marty	9a628c7b5d	ktlint	2019-11-22 12:15:19 +01:00
Benoit Marty	fb46a14172	Fix compilation issue after rebase	2019-11-22 12:15:19 +01:00
Benoit Marty	2871e4f5b1	Login screens: forget password screens	2019-11-22 12:15:19 +01:00
Benoit Marty	4485d1c685	Registration flow: SDK side	2019-11-22 12:14:48 +01:00
Matthew Hodgson	2e87e0b4c1	fix typo	2019-11-21 01:41:59 +00:00
ganfra	6b1b3bec85	Clean code for klint	2019-11-14 13:25:04 +01:00
ganfra	6bd6ececb7	Timeline: handle sticker events	2019-11-14 13:23:12 +01:00
ganfra	c7db695e67	Timeline: handle join rules event	2019-11-14 12:21:55 +01:00
ganfra	79350899c5	Read receipts: use primary key to query	2019-11-13 19:21:14 +01:00
ganfra	2e50d2a36e	Clean code for klint	2019-11-13 11:38:30 +01:00
ganfra	643c062858	Merge branch 'develop' into feature/perf_again	2019-11-13 10:44:59 +01:00
ganfra	ec71b53c1e	RoomSummary: don't map read receipts	2019-11-12 19:25:21 +01:00
Benoit Marty	fc91694bdd	Merge pull request #673 from vector-im/feature/us ... Update strings	2019-11-12 12:08:55 +01:00
ganfra	1bd2c0d220	Merge branch 'develop' into feature/perf_again	2019-11-08 17:09:22 +01:00
ganfra	bcb811a7e8	Realm perf: use Dispatchers.Default for write, as we don't want to create so many threads (and we can only have one write transaction at a time)	2019-11-08 17:08:44 +01:00
ganfra	17f3614288	Perf: try to optimize room summary updates	2019-11-08 13:48:35 +01:00
ganfra	61ac250e2b	Merge branch 'develop' into feature/room_list_actions	2019-11-07 15:43:21 +01:00
Benoit Marty	b6bb714264	Display name and avatar of the user	2019-11-07 14:18:57 +01:00
Benoit Marty	a87310ac15	update comment	2019-11-07 14:18:57 +01:00
Benoit Marty	032e1b3d19	ktlint	2019-11-07 14:18:57 +01:00
Benoit Marty	9c952b6bc8	Display ignored users list	2019-11-07 14:18:57 +01:00
Benoit Marty	fbae3d27c2	Ignore/Unignore userIds	2019-11-07 14:13:29 +01:00
Benoit Marty	2f7d1f9f01	Ignored Users account data	2019-11-07 14:13:29 +01:00
Benoit Marty	114101699d	Fix potential ignoring of account data (return@foreach)	2019-11-07 14:13:29 +01:00
Benoit Marty	2027802f82	Add debug screen for all SAS emoji	2019-11-07 10:37:49 +01:00
ganfra	3af7ca9ab0	Retrofit: lazy init okhttp	2019-11-06 20:07:28 +01:00
ganfra	93ef3edab3	Remove some use of sync write in realm	2019-11-06 18:47:11 +01:00
Benoit Marty	d0c3271628	Import string from Riot-Android and fix #671	2019-11-06 18:19:37 +01:00
ganfra	ad9a48d5fa	Clean code	2019-11-05 18:36:30 +01:00
Benoit Marty	9d478dbfe2	Import change form https://github.com/matrix-org/matrix-android-sdk/pull/505	2019-11-05 11:18:22 +01:00
ganfra	93df8c56a8	Fix compilation error and use mockk instead of manual mocking (prone to error)	2019-11-04 17:09:03 +01:00
ganfra	6177e69855	Merge branch 'develop' into feature/room_list_actions	2019-11-04 15:11:20 +01:00
ganfra	5c71cabb5f	Clean code	2019-11-04 15:08:08 +01:00
Benoit Marty	a85b5af761	Merge pull request #641 from vector-im/feature/fix_crash ... Fix crash	2019-11-04 14:28:31 +01:00
ganfra	d47cf7e932	Merge branch 'develop' into feature/fix_#498	2019-10-30 19:26:11 +01:00
ganfra	101057520b	Fix disambiguated with empty senderName	2019-10-30 19:25:24 +01:00
Benoit Marty	118870bc41	ktlint cleanup	2019-10-29 17:02:55 +01:00
Benoit Marty	d001ab5bef	Merge pull request #640 from Dominaezzz/kotlinify ... The last of the clean up.	2019-10-29 17:01:38 +01:00
ganfra	035359cb35	Update CHANGES and clean code	2019-10-28 17:01:41 +01:00
ganfra	57b640622b	Sender Name: we should use disambiguated display name over senderName. PrevContent fallback is now handled in SDK	2019-10-28 16:48:55 +01:00
ganfra	00ca5dc70a	RoomListActions: handle room notification state. Still need to branch UI	2019-10-25 18:23:47 +02:00
Benoit Marty	0040f8e924	Fix crash reported by Rageshake, stateKey can be null	2019-10-24 18:51:47 +02:00
Benoit Marty	6cca242f77	Fix Android test compilation issue	2019-10-24 17:49:34 +02:00
Benoit Marty	2929b8f617	Ensure Android tests compile and fix warnings	2019-10-24 17:24:42 +02:00
Benoit Marty	7c567b04bb	Make test compile and pass	2019-10-24 16:36:12 +02:00
Dominic Fischer	1ac99e92a6	Light refactoring. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:58:11 +01:00
Dominic Fischer	5ab975cc5c	General kotlinification. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:53:44 +01:00
Dominic Fischer	2cf63ea92a	Remove import java.util.* from kotlin files. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:53:10 +01:00
ganfra	b17b54d218	Merge pull request #637 from vector-im/feature/fix_room_summary ... Feature/fix some room related stuff	2019-10-23 17:29:14 +02:00
ganfra	187e2a26db	Clean after Benoit's review	2019-10-23 17:26:56 +02:00
ganfra	2f5fdbb7e2	Clean and fix lint	2019-10-23 16:20:38 +02:00
ganfra	8b1411f533	Read marker: test if local echo before hitting the SDK to change read marker id + reduce a bit delay	2019-10-23 16:13:35 +02:00
Benoit Marty	ff81715783	Import Strings from Riot	2019-10-23 14:18:40 +02:00
ganfra	50bf6df7fe	Room summary: fix some issues with local echo and sending event	2019-10-23 11:55:19 +02:00
Benoit Marty	377a228f88	Improve code	2019-10-22 17:31:07 +02:00
Benoit Marty	f43dcb1183	Update room summary when saving local echo from DefaultRelationService	2019-10-22 16:54:48 +02:00
Benoit Marty	492ed3954a	code cleanup	2019-10-22 16:54:48 +02:00
Benoit Marty	7890e83204	Merge pull request #630 from vector-im/feature/crypto_lock ... Fix dead lock on crypto	2019-10-22 16:53:33 +02:00
Benoit Marty	00d1a2c380	Merge pull request #629 from vector-im/feature/fix_malformed_event_bug ... Fix / event mapper persist the clear type in type	2019-10-22 14:47:08 +02:00
Benoit Marty	78dfd6b3e6	Fix potential lock due to nested synchronized(unknownSessionsFailure)	2019-10-22 14:20:43 +02:00
Benoit Marty	3abce34484	Add in existingRequest only if not filtered	2019-10-22 12:45:36 +02:00
Benoit Marty	7416fec93e	Do not decrypt event if session is unknown	2019-10-22 12:37:17 +02:00
Benoit Marty	3c40f64fb7	Add a few comments	2019-10-22 12:33:25 +02:00
Benoit Marty	b57c71b1c9	Remove unused import	2019-10-22 12:27:55 +02:00
Benoit Marty	fea54952d3	Code quality	2019-10-22 12:26:56 +02:00