285 Commits

Author	SHA1	Message	Date
ganfra	604de7eebc	Dagger: fix some merging issues	2019-06-28 09:35:34 +02:00
ganfra	f18bc9bd00	Dagger: fix no session	2019-06-27 19:12:46 +02:00
ganfra	f91959ea96	Merge branch 'develop' into feature/dagger	2019-06-27 18:57:49 +02:00
ganfra	2063a3e535	Merge branch 'develop' into feature/dagger	2019-06-27 18:56:23 +02:00
Valere	d5625b95fe	Fix / use senderId when display name cannot be resolved	2019-06-27 17:58:11 +02:00
ganfra	1fa7b7367a	Dagger: merge develop compiling now.	2019-06-27 15:25:01 +02:00
Valere	0765d6d1da	Fix / Action bottom sheet show preview for encrypted messages	2019-06-27 15:21:10 +02:00
Valere	fb7ada72dd	Fix / register/unregister pusher	2019-06-27 14:08:54 +02:00
Valere	338de3ebf5	Cleans notification pref screen ... + fix troubleshoots	2019-06-27 12:21:38 +02:00
Benoit Marty	f092c40999	Merge pull request #228 from vector-im/feature/settings_v2 ... Split settings into sub sections	2019-06-27 11:54:03 +02:00
Benoit Marty	f414f46cba	General setting: avatar and display name	2019-06-27 11:53:28 +02:00
Benoit Marty	ae7e617fdd	Rename and format and remove duplicate EventType.REDACTION	2019-06-27 10:46:04 +02:00
Benoit Marty	d1642c928a	Move specific classes for FDroid into FDroid variant source code	2019-06-27 10:46:04 +02:00
Benoit Marty	76b890fe06	Merge pull request #230 from vector-im/feature/e2e_hint ... Change hint for encrypted room (fix #210)	2019-06-26 21:05:19 +02:00
ganfra	b2d2582e0f	Merge branch 'develop' into feature/dagger [WIP]	2019-06-26 20:58:46 +02:00
Benoit Marty	25b7bf76bf	Change hint for encrypted room (fix #210)	2019-06-26 18:49:55 +02:00
Valere	3e00576230	New status bar notification icons	2019-06-26 17:55:07 +02:00
ganfra	6e7adaec59	Dagger: prepare for multi session [WIP]	2019-06-26 17:51:24 +02:00
Benoit Marty	ad3d303405	Fix issue in notification preference	2019-06-26 17:37:03 +02:00
Benoit Marty	7c47c6a033	split preference (Kotlin)	2019-06-26 17:20:26 +02:00
Benoit Marty	8370f4fc76	rename file	2019-06-26 15:05:07 +02:00
Benoit Marty	0c0ef38b4f	Fix notification on FDroid	2019-06-26 13:32:55 +02:00
Benoit Marty	134c2fcd42	Notification: Fix TestAccountSettings test	2019-06-26 12:19:54 +02:00
Benoit Marty	2625e11508	rename method	2019-06-26 12:19:54 +02:00
Benoit Marty	9fa3a75fb6	Notification: display room avatar	2019-06-26 12:19:54 +02:00
Benoit Marty	b388be93c8	Notification: better code	2019-06-26 12:19:54 +02:00
Benoit Marty	5a1242109d	Notification: display rooms and users' avatars	2019-06-26 12:19:54 +02:00
Benoit Marty	4f0ed402bf	Notification: cleanup	2019-06-26 12:19:54 +02:00
Benoit Marty	f6c500d120	Notification: dismiss all on sign out	2019-06-26 12:19:54 +02:00
Benoit Marty	785f33177d	Notification: open room and clear drawer - Smart reply - Mark as read - dismiss all	2019-06-26 12:19:54 +02:00
Benoit Marty	ce3242c748	Code quality: preference	2019-06-26 12:19:54 +02:00
Benoit Marty	71ae99012b	Code review and cleanup	2019-06-26 12:19:54 +02:00
Valere	abb1c3f3c4	Fix / try to get edited message content first	2019-06-26 12:19:54 +02:00
Valere	c01af6ac78	Stop notification using preference when disabled	2019-06-26 12:19:54 +02:00
Valere	74099be316	Remove / Add pusher from enable notif preference ... +Added Retrofit/Moshi null serializer for pusher kind	2019-06-26 12:19:54 +02:00
Valere	4e6b34b9d1	Fix issues on Notification Event resolver	2019-06-26 12:19:54 +02:00
Valere	0584fc3666	Get real push rules from server and evaluate them	2019-06-26 12:19:54 +02:00
Valere	2e417a9143	Basic FCM vs fdroid mode	2019-06-26 12:19:54 +02:00
Valere	0e46fc4c0a	WIP	2019-06-26 12:19:54 +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	2741780553	Change scope of PermalinkHandler	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	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	046aac74c2	Add link for reference	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