6778 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nielsandriesse	edc0b43cbe	Merge branch 'dev' into security	2020-10-29 10:19:22 +11:00
nielsandriesse	e667c6ee7e	Make style consistent across platforms	2020-10-29 10:16:49 +11:00
Niels Andriesse	c9ecd0ded3	Merge pull request #370 from loki-project/voice-messages ... Improved Voice Messages UI	2020-10-29 09:27:02 +11:00
Anton Chekulaev	d178eefd98	Clean up any previously scheduled background poll jobs.	2020-10-28 17:29:23 +11:00
nielsandriesse	7319e310eb	Clean up indentation	2020-10-28 16:06:48 +11:00
Anton Chekulaev	4fe6c8acfd	Work manager migration code removed.	2020-10-28 15:46:05 +11:00
Anton Chekulaev	577ccfb04a	Merge branch 'dev' of https://github.com/loki-project/session-android into background-polling	2020-10-28 15:32:24 +11:00
nielsandriesse	6b84bb63f9	Merge branch 'dev' into voice-messages	2020-10-28 15:29:12 +11:00
nielsandriesse	c8f7d788b9	Fix migration issue	2020-10-28 15:04:47 +11:00
Niels Andriesse	ced392a555	Merge pull request #368 from loki-project/open-group-profile-pictures ... Open Group Profile Pictures	2020-10-28 14:58:40 +11:00
nielsandriesse	404ea7d347	Merge branch 'dev' into open-group-profile-pictures	2020-10-28 14:39:13 +11:00
nielsandriesse	6ad688b8d0	Update build number	2020-10-28 13:57:59 +11:00
Niels Andriesse	fe854cf625	Merge pull request #366 from loki-project/onion-requests-2 ... Further Improved Path Maintenance	2020-10-28 13:18:54 +11:00
nielsandriesse	49b588a6e3	Update build number	2020-10-28 11:31:53 +11:00
nielsandriesse	8070b9dd4e	Update build number	2020-10-28 10:14:53 +11:00
Anton Chekulaev	0b1b7cd258	Merge branch 'dev' of https://github.com/loki-project/session-android into background-polling	2020-10-27 18:56:44 +11:00
nielsandriesse	00e45174e4	Update build number	2020-10-27 14:41:03 +11:00
Anton Chekulaev	8101ad665e	Merge branch 'dev' of https://github.com/metaphore/session-android into background-polling	2020-10-27 12:23:48 +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
Niels Andriesse	e005fbf282	Merge pull request #369 from RyanRory/PN-fix-step-1 ... Fix PNs Part 1	2020-10-27 10:13:53 +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
Anton Chekulaev	42b9468c63	New design for audio view progress bar.	2020-10-26 23:14:26 +11:00
Anton Chekulaev	82c5df48e7	Merge branch 'dev' into audio-view-design-update	2020-10-26 17:53:39 +11:00
Anton Chekulaev	7d9f5a4fd1	Gracefully handle the missing duration field for decoded audio.	2020-10-26 12:03:20 +11:00
nielsandriesse	43121607d0	Switch key pair generation mechanism	2020-10-26 11:53:08 +11:00
nielsandriesse	8395fd4b6f	Merge branch 'dev' into onion-requests-2	2020-10-26 11:06:42 +11:00
nielsandriesse	53a58acbd5	Update version number	2020-10-26 09:36:09 +11:00
nielsandriesse	6027f2c5e1	Merge branch 'dev' into onion-requests-2	2020-10-26 08:57:32 +11:00
Anton Chekulaev	5974abee34	Use the build tools version matching compile SDK.	2020-10-22 17:33:30 +11:00
Anton Chekulaev	6a93653080	Message audio view is no longer seekable when it's uploading.	2020-10-22 17:30:04 +11:00
Anton Chekulaev	018e3288a4	Better input event handling for waveform seek bar.	2020-10-22 16:48:41 +11:00
Anton Chekulaev	aacbe02327	A quick fix.	2020-10-22 13:57:48 +11:00
Anton Chekulaev	04c132853a	Minor cleanup.	2020-10-22 13:55:00 +11:00
Anton Chekulaev	b6d8898ff9	Fixed attachment table queries. ... Attachment audio extras job. Job manager supports parcelable types now.	2020-10-22 13:52:53 +11:00
nielsandriesse	19c5fd8d18	Minor UI polish	2020-10-21 10:20:23 +11:00
Anton Chekulaev	001a5a90cb	Merge remote-tracking branch 'loki/dev' into audio-view-design-update	2020-10-20 20:46:24 +11:00
Anton Chekulaev	674da88274	Audio extra columns for attachment table.	2020-10-20 18:58:51 +11:00
Anton Chekulaev	255271bfaf	Base backup restore activity.	2020-10-20 15:39:01 +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
Niels Andriesse	37eefd0127	Merge pull request #367 from loki-project/shared-sender-keys ... SSK Improvements Part 1	2020-10-19 09:56:26 +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	0cd24905b7	Update version number	2020-10-14 10:11:30 +11:00
Anton Chekulaev	091847b131	Restrict the waveform seek bar progress value to a 0..1 range.	2020-10-13 20:09:24 +11:00
Anton Chekulaev	793e6bf10f	Waveform fill color attribute for message audio view.	2020-10-12 19:01:49 +11:00