878 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Valere	4505d13385	Fix / SAS verification infinite waiting on last step ... Missing state update to verified after mac verification	2019-06-26 10:46:58 +02:00
Valere	8fe0bd5abe	Merge pull request #214 from vector-im/feature/update_quick_reactions ... Feature/ Update quick reactions	2019-06-25 15:47:17 +02:00
Valere	98176b9760	Cleaning (code review)	2019-06-25 15:45:44 +02:00
Benoit Marty	104ffc930d	Merge pull request #200 from vector-im/feature/permalinks ... Handle permalink with the new navigation UX - WIP	2019-06-25 09:34:58 +02:00
Benoit Marty	2741780553	Change scope of PermalinkHandler	2019-06-25 09:34:12 +02:00
Benoit Marty	625242a3d9	handle all themes	2019-06-25 09:34:12 +02:00
Benoit Marty	401f878a9c	Fix ConcurrentModificationException	2019-06-25 09:34:12 +02:00
Benoit Marty	3e97503220	Avoid erasing all cache	2019-06-25 09:34:12 +02:00
Benoit Marty	76ade2957e	Handle permalink click	2019-06-25 09:34:12 +02:00
Benoit Marty	b1e009f8b4	Handle eventId v4 (https://matrix.org/docs/spec/rooms/v4#event-ids)	2019-06-25 09:33:52 +02:00
Benoit Marty	90f420b287	Cleanup PermalinkHandler and Navigation	2019-06-25 09:33:52 +02:00
Benoit Marty	73b55fd975	Group navigation cleanup	2019-06-25 09:33:52 +02:00
Benoit Marty	ad601c7d5a	Merge pull request #189 from vector-im/feature/third_party_notice ... Feature/third party notice	2019-06-25 09:32:08 +02:00
Benoit Marty	046aac74c2	Add link for reference	2019-06-25 09:31:45 +02:00
Benoit Marty	0998ffb5f2	Update open source license file	2019-06-25 09:31:45 +02:00
Benoit Marty	8ff6fbb153	Handle redirection	2019-06-25 09:31:45 +02:00
Benoit Marty	9d3a8e7c40	Add usage of com.google.android.gms:oss-licenses-plugin to list open source licenses	2019-06-25 09:31:45 +02:00
Valere	56aaa9dce3	Fix / updated unicode for smiling	2019-06-24 16:15:26 +02:00
Valere	43ead66991	Update quick reactions to new design	2019-06-24 16:13:58 +02:00
Benoit Marty	92eb7d55dc	Merge pull request #207 from vector-im/feature/version ... Display some version of Riot and SDK (Fix #185)	2019-06-21 17:07:55 +02:00
Benoit Marty	1cfc85a772	Display some version of Riot and SDK (Fix #185)	2019-06-21 11:13:16 +02:00
ganfra	47968c9447	Dagger: everything should be injected ok now	2019-06-21 10:36:02 +02:00
ganfra	07fee8ed3d	Dagger: continue reworking on app and sdk [WIP]	2019-06-20 19:26:59 +02:00
Benoit Marty	1eb374fa49	Merge pull request #188 from vector-im/feature/disambiguation ... Disambiguation of display names	2019-06-20 17:29:01 +02:00
Benoit Marty	285da114e7	better code (ganfra's review)	2019-06-20 17:27:15 +02:00
Benoit Marty	34870591b4	Update wording	2019-06-20 17:22:38 +02:00
ganfra	ee87c253fe	Dagger: continue working on app side. Now compile but some DI are not branched yet.	2019-06-19 19:40:59 +02:00
ganfra	9c1f870694	Dagger: start handling app dependencies [WIP]	2019-06-18 20:00:20 +02:00
Benoit Marty	56e0680398	Remove unused class	2019-06-18 16:11:24 +02:00
Benoit Marty	8c0a1ed37d	Rename "sender" to "senderId" for code clarity	2019-06-18 16:11:24 +02:00
Benoit Marty	625500212d	Manage display name disambiguation (Fixes #172)	2019-06-18 16:09:48 +02:00
Benoit Marty	b1f5b3ad96	Merge pull request #187 from vector-im/feature/issues_fix ... Add a few feature	2019-06-18 16:03:36 +02:00
Benoit Marty	02f84a3b53	View source of encrypted event	2019-06-18 13:14:39 +02:00
Benoit Marty	7fe662598b	Handle click on encryption message	2019-06-18 12:56:08 +02:00
Benoit Marty	5bfa67b442	Handle click on encrypted message	2019-06-18 12:45:24 +02:00
Benoit Marty	a53e40e1ee	Create MessageInformationDataFactory for reusability	2019-06-18 12:33:07 +02:00
Benoit Marty	273c8a19b8	Fix UI issue notification troubleshot screen	2019-06-18 10:30:56 +02:00
Benoit Marty	53bdd58c1b	Fix UI issue on BugReportActivity (send button not visible)	2019-06-18 10:25:13 +02:00
Benoit Marty	51879845f2	Merge pull request #186 from vector-im/feature/crypto_up ... Crypto work	2019-06-17 19:07:24 +02:00
Benoit Marty	f2372841f6	KeysBackup: import change from https://github.com/vector-im/riot-android/pull/3127	2019-06-17 19:07:04 +02:00
Benoit Marty	0497d14a08	SAS: import change from https://github.com/matrix-org/matrix-android-sdk/pull/467	2019-06-17 19:06:32 +02:00
Benoit Marty	0b6b95110f	Merge pull request #182 from vector-im/feature/cryptoKeys ... Crypto: Import/export room keys (the old way)	2019-06-17 19:05:43 +02:00
Benoit Marty	191d80e5f5	Fix issue with key importation	2019-06-17 19:05:26 +02:00
Benoit Marty	659ba34fb3	Remove CryptoAsyncHelper and use only coroutine	2019-06-17 19:05:26 +02:00
Benoit Marty	907a1d1a4b	Import keys: WIP	2019-06-17 19:05:26 +02:00
Benoit Marty	99d2e8388a	Fix crash	2019-06-17 19:04:48 +02:00
Benoit Marty	38b1d24953	Use foldToCallback() whenever it's possible	2019-06-17 19:04:48 +02:00
Benoit Marty	b682f3e982	Cleaner code	2019-06-17 19:04:48 +02:00
Benoit Marty	5f0d1d9536	Crypto: export room keys	2019-06-17 19:04:48 +02:00
ganfra	c2c2d0b21e	Dagger: make SDK DI working	2019-06-17 18:17:37 +02:00