932 Commits

Author	SHA1	Message	Date
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
Benoit Marty	3dc5ef54ab	Fix compilation warnings	2019-10-22 12:21:50 +02:00
Benoit Marty	cebd8136da	Merge branch 'develop' into kotlinify	2019-10-22 12:16:20 +02:00
Valere	64b3568d51	Fix / event mapper persist the clear type in type	2019-10-22 11:57:11 +02:00
Dominic Fischer	5e4e54153c	Fix build error. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-21 22:52:58 +01:00
Dominic Fischer	d071324694	Address review comments. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-21 22:29:36 +01:00
Benoit Marty	e39c4a7925	fix ktlint issue	2019-10-21 17:22:28 +02:00
Benoit Marty	a7a19dab11	Report content: Service and REST request	2019-10-21 17:22:00 +02:00
Benoit Marty	723a007c39	Merge pull request #626 from vector-im/feature/myUserIdInject ... Inject userId where possible	2019-10-21 16:01:48 +02:00
Benoit Marty	b1710fde60	Merge pull request #618 from vector-im/feature/mark_all_read ... Mark all as read	2019-10-18 15:02:16 +02:00
Benoit Marty	cd0a40c18d	Fix compil test issue	2019-10-18 14:34:44 +02:00
Benoit Marty	17636019e0	Change order of parameters	2019-10-18 14:32:34 +02:00
Benoit Marty	3986839801	Inject userId	2019-10-18 14:25:19 +02:00
Benoit Marty	28e5e42ab1	Merge pull request #614 from vector-im/feature/recycler_view_upgrade ... Upgrade RecyclerView version to fix issues with a11y.	2019-10-15 10:47:59 +02:00
Dominic Fischer	f7f97e2098	Typos ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-12 16:04:47 +01:00
Dominic Fischer	e28e2dadb9	Some more clean up ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-12 15:37:20 +01:00
Benoit Marty	3622c0ecb4	Mark all as read	2019-10-11 16:22:32 +02:00
Benoit Marty	0a0c344bfb	Upgrade RecyclerView version to fix issues with a11y. ... Also minor upgrade of some other libs	2019-10-11 10:10:16 +02:00
Benoit Marty	fbb23dfb66	ktlint: fix (no-empty-first-line-in-method-block) issues	2019-10-09 16:43:12 +02:00
Benoit Marty	e5779d425a	ktlint: fix (experimental:multiline-if-else) issues	2019-10-09 16:40:44 +02:00
Benoit Marty	30e43e47cd	Fix filename ktlint issues	2019-10-09 15:44:01 +02:00
Benoit Marty	15dc4d6369	Fix ktlint issue automatically by running ./ktlint --android -v -F	2019-10-09 15:24:05 +02:00
Benoit Marty	eec470f2ce	Fix code quality issues	2019-10-09 15:15:15 +02:00
Benoit Marty	cdfc402599	Fix Timber error in formatting	2019-10-09 15:06:38 +02:00
Benoit Marty	a9c474105a	Fix warnings in the SDK	2019-10-09 12:49:00 +02:00
Benoit Marty	36c5f9af13	Merge pull request #583 from vector-im/feature/invot_notification ... Invitation notifications are not dismissed automatically if room is joined from another client (#347)	2019-10-09 12:48:07 +02:00
Benoit Marty	549f749682	Nest the try catch blocks	2019-10-08 14:00:11 +02:00
Benoit Marty	e80191b2e0	Use mutableSet	2019-10-08 13:52:26 +02:00
Benoit Marty	c62c77f14c	Stop sending bus event from SDK to App.	2019-10-08 12:00:40 +02:00
Benoit Marty	50a0660ab6	Invitation notifications are not dismissed automatically if room is joined from another client (#347)	2019-10-08 10:56:47 +02:00
Benoit Marty	3f9b7813bc	Remove undocumented attribute and fix issue with image size when it contains exif rotation	2019-10-08 10:53:21 +02:00
Benoit Marty	f34f28b668	Add Exif orientation info to ContentAttachmentData	2019-10-08 10:52:54 +02:00
Benoit Marty	adf0382d28	Merge pull request #603 from vector-im/feature/clear_corrupted_realm ... Feature/clear corrupted realm	2019-10-07 16:35:23 +02:00
Benoit Marty	c1c1c3f999	Use latest coroutine lib: v1.3.2	2019-10-07 16:22:09 +02:00
Benoit Marty	8b04fdab77	Upgrade other libraries	2019-10-07 16:22:09 +02:00
Benoit Marty	4ad86a13a0	Upgrade the dependencies to the latest version	2019-10-07 16:21:18 +02:00
ganfra	4f7ec91255	Merge pull request #604 from vector-im/feature/performance ... Feature/performance	2019-10-07 16:08:39 +02:00
Benoit Marty	979b42aa30	Do not delete the crypto DB when deleting the session DB	2019-10-07 16:07:57 +02:00
Benoit Marty	d2b9668d4e	Inject element where they are used	2019-10-07 15:25:54 +02:00
ganfra	8e39fd2a70	Clean after benoit's review	2019-10-07 14:45:58 +02:00
ganfra	abbc62dd35	Clear corrupted db: add some logs	2019-10-04 19:42:27 +02:00
ganfra	77de059dc9	Timeline: fix potential issues when starting/disposing the timeline	2019-10-04 19:37:44 +02:00
ganfra	1931a1a4a4	Sync: use some suspending function where it makes sense	2019-10-04 19:37:23 +02:00
ganfra	4e4fb4c565	Crypto store: fix potential issue with realm open/close process	2019-10-04 19:36:10 +02:00
ganfra	0582d0f641	Timeline: fix some crashes	2019-10-04 12:12:39 +02:00
ganfra	ef2af14529	Realm: remove RealmLiveData and use Optional for LiveData with potential null value	2019-10-03 19:19:53 +02:00
ganfra	275dd20412	Optimize: don't build OkHttp in Application OnCreate if we don't need it	2019-10-01 20:12:01 +02:00
ganfra	42e0a45f3f	Merge branch 'develop' into feature/read_marker	2019-10-01 13:37:21 +02:00
ganfra	e842bf13b2	Timeline: fix back pagination state	2019-10-01 12:32:48 +02:00
ganfra	b5c6c1af0d	Realm: allow to clear corrupted session db	2019-09-30 19:09:10 +02:00
Benoit Marty	53b1b89c47	after login, the icon in the top left is a green 'A' for (all communities) rather than my avatar (#267)	2019-09-26 17:30:30 +02:00
ganfra	8605095668	Fix quality code issues	2019-09-26 16:49:41 +02:00
ganfra	737959f616	Merge branch 'develop' into feature/read_marker	2019-09-26 15:15:34 +02:00
Benoit Marty	a060431aaf	Fix my dirty code	2019-09-26 13:51:44 +02:00
ganfra	a3f561d788	Merge branch 'develop' into feature/read_marker	2019-09-26 12:19:40 +02:00
ganfra	0ea878af8a	Timeline: fix some more issues	2019-09-26 11:55:16 +02:00
Benoit Marty	99de40c980	Merge pull request #589 from vector-im/feature/media_upload_failure ... Fix media upload failure	2019-09-26 11:30:54 +02:00
Benoit Marty	810a97c639	Import string from Android-SDK (#355)	2019-09-26 11:14:13 +02:00
Benoit Marty	62b7a83a31	Update after Dominaezzz's review	2019-09-26 10:08:44 +02:00
ganfra	4a80df082c	Timeline: refact [WIP]	2019-09-25 19:14:12 +02:00
Benoit Marty	60f6b3ef02	Auto review	2019-09-25 17:08:58 +02:00
Benoit Marty	a0b1ef3216	Do not upload file to big for the homeserver (#587) ... Also create a HomeServerCapabilitiesService which provide configuration of the homeserver. Data are retrieved every 8 hours (as RiotWeb?)	2019-09-25 16:59:50 +02:00
Benoit Marty	f077cc8467	Stop sending media in an infinite loop in case of error (part of #587) ... Not sure how this commit fix it, but the issue is not observed anymore with it	2019-09-25 14:09:26 +02:00
Benoit Marty	f3039601bf	throw Failure instead of meaning less IOException	2019-09-25 11:27:23 +02:00
Benoit Marty	4c04014e4d	Do not log big data request (ex: file upload)	2019-09-25 11:26:49 +02:00
Benoit Marty	ae8bceacba	Create Extension to convert a Response to a Failure -> expose to other object	2019-09-25 11:26:13 +02:00
Benoit Marty	9b91b6ea87	Create Extension to convert a Response to a Failure	2019-09-25 10:56:18 +02:00
Benoit Marty	1c9cf7a810	Dagger code cleanup	2019-09-24 13:40:03 +02:00
ganfra	05d09bf950	Merge branch 'develop' into feature/read_marker	2019-09-24 11:10:59 +02:00
Benoit Marty	5a2a9f908a	isEventRead() returns true if the event has been sent by the user	2019-09-24 10:04:57 +02:00
ganfra	f6d34ec7fd	Timeline: update state management	2019-09-23 17:43:37 +02:00
Benoit Marty	546da0f173	Merge branch 'develop' into feature/notif_invit	2019-09-23 16:23:22 +02:00
Benoit Marty	8e1a964679	After Ganfra's review	2019-09-23 15:08:18 +02:00
ganfra	7e29665fd0	Timeline: add some comments and checks	2019-09-20 18:34:31 +02:00
Benoit Marty	e04bf31faa	Fix wrong "no network" banner	2019-09-20 18:18:55 +02:00
Benoit Marty	d25cf79b07	Cleanup	2019-09-20 17:50:57 +02:00
Benoit Marty	faa8e6bbb2	m.notice messages trigger push notifications (#238)	2019-09-20 17:50:57 +02:00
Benoit Marty	d3d4deb884	Rework Action (better kotlin code)	2019-09-20 17:50:57 +02:00
Benoit Marty	f6b8e0c479	Fix issue: push rules was not retrieved after a clear cache. ... We now store push rules from the sync response	2019-09-20 17:50:57 +02:00
Benoit Marty	2a726f54a2	Remove userId from PushRulesEntity and PusherEntity objects	2019-09-20 17:50:15 +02:00
Benoit Marty	1197d4021d	Fix regression on PushRulesApi	2019-09-20 17:50:15 +02:00
Benoit Marty	03f8120b7d	Create enum for Push rules. Also add some TODOs	2019-09-20 17:50:15 +02:00
Benoit Marty	acd7a709de	Dagger: create @UserId to inject userId	2019-09-20 17:50:15 +02:00
Benoit Marty	b3e1c3969d	Little changes after review	2019-09-20 17:34:50 +02:00
ganfra	90eeb68d36	Timeline: fix permalink towards an hidden event	2019-09-20 17:22:04 +02:00
Benoit Marty	a993a30203	Handle left group from sync	2019-09-19 17:08:22 +02:00
ganfra	ea0809ff87	Merge branch 'develop' into feature/read_marker	2019-09-19 16:57:00 +02:00
ganfra	9668487b6b	Timeline/Read: update read receipt locally to	2019-09-19 16:17:58 +02:00
Benoit Marty	36866dd24e	Save draft of a message when exiting a room with non empty composer (#329)	2019-09-19 13:09:08 +02:00
Benoit Marty	7da9cafcc2	Remove any notification of a redacted event (#563) ... Also do some cleanup and kotlinification on the code	2019-09-19 13:01:00 +02:00
Benoit Marty	468bd5bcc9	Message Editing: Update notifications (#128)	2019-09-19 12:57:58 +02:00
Benoit Marty	3169093c50	Quick fix on the no connection banner displayed when internet is available	2019-09-19 12:55:39 +02:00
Benoit Marty	0ffb5e627e	Cleanup injected constructors	2019-09-19 12:43:39 +02:00