3913 Commits

Author	SHA1	Message	Date
nielsandriesse	404ea7d347	Merge branch 'dev' into open-group-profile-pictures	2020-10-28 14:39:13 +11:00
nielsandriesse	4c81f4f197	Merge branch 'dev' into onion-requests-2	2020-10-27 11:12:42 +11:00
nielsandriesse	5d3c495f63	Reword log	2020-10-27 10:15:15 +11:00
Ryan ZHAO	ae261ebd83	disable background polling when FCM is on	2020-10-27 10:03:32 +11:00
nielsandriesse	a959c02252	Fix inverted boolean	2020-10-27 09:59:29 +11:00
nielsandriesse	4e69a538cb	Fix crash	2020-10-27 09:42:39 +11:00
nielsandriesse	6027f2c5e1	Merge branch 'dev' into onion-requests-2	2020-10-26 08:57:32 +11:00
nielsandriesse	19c5fd8d18	Minor UI polish	2020-10-21 10:20:23 +11:00
nielsandriesse	bdbb03687e	Fix build	2020-10-19 15:21:15 +11:00
nielsandriesse	d19a69567d	Clean	2020-10-19 15:12:06 +11:00
nielsandriesse	7cbeace0ce	Merge branch 'dev' into open-group-profile-pictures	2020-10-19 14:41:37 +11:00
nielsandriesse	9fd7b5802f	Debug	2020-10-19 09:35:25 +11:00
nielsandriesse	b192542427	Fix various SSK race conditions	2020-10-19 09:27:34 +11:00
nielsandriesse	f9e8eb2549	Debug	2020-10-09 14:38:29 +11:00
nielsandriesse	501f3bbb87	Match iOS path maintenance changes	2020-10-09 13:57:52 +11:00
nielsandriesse	bda81fa9f8	Fix indentation	2020-10-08 15:08:09 +11:00
Niels Andriesse	5b498b9f4a	Merge pull request #364 from RyanRory/SSK-group-editing-crash ... Fix SSK Group Editing Crash	2020-10-08 15:05:40 +11:00
Niels Andriesse	ba1033bfe5	Merge pull request #363 from loki-project/shared-sender-keys ... Fix SSK Group Leaving Race Condition	2020-10-08 15:05:21 +11:00
Niels Andriesse	0e39374b7b	Retry PN server requests if needed	2020-10-07 15:56:55 +11:00
Ryan ZHAO	fd108e9d00	fix the crash when editing ssk groups with both adding and removing	2020-10-07 14:55:05 +11:00
nielsandriesse	0c669548f3	Disable the done button while the group is being created	2020-10-06 14:19:52 +11:00
nielsandriesse	6d724fe349	Disable the apply button while the group is being updated	2020-10-06 14:15:37 +11:00
nielsandriesse	389b4b9768	Show a loader while the group is updating	2020-10-06 14:10:57 +11:00
nielsandriesse	a34b1f74b3	Fix SSK group leaving race condition	2020-10-06 13:47:46 +11:00
nielsandriesse	cd177ee61e	Simplify expression	2020-10-05 11:23:59 +11:00
Niels Andriesse	91a62a7449	Merge pull request #360 from RyanRory/ssk-closed-group-leaving-message ... Fix Group Leaving Copy	2020-10-05 11:22:43 +11:00
nielsandriesse	a51850a147	Potentially fix crashes	2020-10-02 15:40:55 +10:00
nielsandriesse	9b40a2c0b8	Fix various minor UI issues	2020-10-02 15:24:13 +10:00
Anton Chekulaev	fa02d41691	Group database cleanup.	2020-10-01 21:26:28 +10:00
Anton Chekulaev	fcba710a32	Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-avatar	2020-10-01 21:19:43 +10:00
Anton Chekulaev	f620d1cdb9	Use a Bitmap instead of a BitmapDrawable for open group attachment notification icon.	2020-10-01 21:15:22 +10:00
nielsandriesse	e2e6ef8761	Generate own ratchet if needed	2020-10-01 15:21:12 +10:00
nielsandriesse	5a4a426560	Debug SSKs further	2020-10-01 13:46:35 +10:00
nielsandriesse	7496ea13aa	Fix name-only updates	2020-10-01 09:38:16 +10:00
Anton Chekulaev	7dffacf957	Avatar check optimization.	2020-09-30 17:33:53 +10:00
nielsandriesse	7b74796558	Fix job name inconsistencies	2020-09-30 10:54:02 +10:00
Ryan ZHAO	4bbc6fe044	modify leaving message	2020-09-30 09:39:59 +10:00
nielsandriesse	65f0eb3906	Debug	2020-09-30 09:09:56 +10:00
nielsandriesse	79374318c2	Fix adding and removing members simultaneously	2020-09-29 13:38:39 +10:00
nielsandriesse	8bcc93c348	Minor refactoring	2020-09-29 10:57:43 +10:00
Anton Chekulaev	2920e3e528	Open group avatar DB record cleanup on deletion. ... General cleanup.	2020-09-28 19:56:40 +10:00
Anton Chekulaev	70815e61d0	Open group avatars.	2020-09-25 21:11:55 +10:00
Niels Andriesse	7fff613306	Merge pull request #348 from metaphore/action-bar-back-buttons ... Add Back Buttons Everywhere	2020-09-25 14:40:49 +10:00
Niels Andriesse	afb7c999f6	Merge pull request #355 from RyanRory/notification-disappear ... Fix Notifications Not Disappearing After a Conversation is Read	2020-09-25 14:21:18 +10:00
nielsandriesse	6121c613de	Update translations for new max group size	2020-09-25 13:48:09 +10:00
Ryan ZHAO	9e16b84763	fix notifications don't disappear after a conversation is read	2020-09-25 10:55:13 +10:00
nielsandriesse	59717aef4c	Set max group size to 20	2020-09-25 09:52:04 +10:00
nielsandriesse	895bbac05b	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2020-09-25 09:51:37 +10:00
nielsandriesse	5812c8b41b	Enable SSKs	2020-09-25 09:51:00 +10:00
Niels Andriesse	c33df6fd55	Merge pull request #352 from RyanRory/open-group-date-issue ... Fix Open Group Message Ordering Issue	2020-09-24 11:39:14 +10:00