9111 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew	d0ebd3533b	Reinstate landing chat animation	2024-06-04 23:17:00 +09:30
Andrew	d331df6334	Revert gradle upgrade	2024-06-04 14:24:15 +09:30
fanchao	6e24df0547	Import	2024-06-04 10:46:02 +10:00
fanchao	172edde628	Correct the usage of flowOn	2024-06-04 10:41:15 +10:00
Ryan ZHAO	dc347d937c	clean	2024-06-03 11:16:29 +10:00
Ryan ZHAO	9e025f1b9d	clean	2024-06-03 10:19:06 +10:00
Ryan ZHAO	a37039cebf	retrieve user profile only during onboarding	2024-05-30 16:08:05 +10:00
Andrew	59910eeb48	Merge branch 'dev' into on	2024-05-30 11:09:51 +09:30
Ryan ZHAO	4acc42730b	Merge branch 'on' of https://github.com/bemusementpark/session-android into poller-fix	2024-05-30 10:28:44 +10:00
Ryan ZHAO	3d402bb08c	Merge branch 'dev' into poller-fix	2024-05-30 10:27:42 +10:00
Andrew	9b6fa0db01	Update version for release-1.18.4	2024-05-30 09:38:33 +09:30
Andrew	c0912bbe6d	Merge pull request #1501 from simophin/SES-2009-blinded-conversation ... [SES-2009] Fix crashes on blinded conversation	2024-05-29 16:32:26 +09:30
Ryan ZHAO	0d1ec5ed0b	Merge branch 'dev' into poller-fix	2024-05-29 15:35:13 +10:00
Ryan ZHAO	b0edfef6a9	fix an issue when onboarding gets stuck in 421 loop when trying to fetch UserProfile config	2024-05-29 15:34:45 +10:00
fanchao	9441fdec21	Merge remote-tracking branch 'upstream/dev' into SES-2009-blinded-conversation	2024-05-29 15:22:57 +10:00
fanchao	c899d723b7	Formatted message	2024-05-29 14:09:48 +10:00
Andrew	fe29bce70d	Merge pull request #1497 from bemusementpark/ses-1948 ... [SES-1948] Do not fetch quotes recursively	2024-05-29 13:23:27 +09:30
fanchao	036b13084f	Message	2024-05-29 13:11:33 +10:00
Andrew	6e887fe43e	Merge pull request #1503 from bemusementpark/ses-1949 ... [SES-1949] Move unapprovedMessageCount to IO	2024-05-29 12:11:10 +09:30
Andrew	410e298bca	Merge pull request #1492 from simophin/ses-1931-fix-debouncer ... [SES-1931] - Fix debouncer crash	2024-05-29 11:38:29 +09:30
Andrew	66c0f940aa	Merge pull request #1494 from simophin/ses-1935-audio-recording-crash ... [SES-1935] Audio recording crash	2024-05-29 11:38:00 +09:30
Andrew	34baa9dc89	Merge pull request #1481 from bemusementpark/s1889 ... [SES-1889] Fix IndexOutOfBounds in MediaPreview	2024-05-29 10:40:45 +09:30
Andrew	30c4341395	Merge pull request #1439 from bemusementpark/ses-1579 ... [SES-1579] Copy issue for disappearing messages	2024-05-29 10:39:08 +09:30
Andrew	69c50e6822	Dont reassign messageRequests if value didn't change	2024-05-29 10:29:47 +09:30
Andrew	4fab64e6ee	Schedule share pref	2024-05-28 19:29:24 +09:30
Andrew	04215f74e1	Bind message requests in HomeAdapter	2024-05-28 16:44:49 +09:30
fanchao	bc9bf59106	Fix syntax error	2024-05-28 15:04:18 +10:00
fanchao	3743ef42bd	Catch another merge function	2024-05-28 14:51:25 +10:00
fanchao	a78c11f258	Wrap config_base.cpp also	2024-05-28 14:37:06 +10:00
Andrew	cd302f9f27	Move unapprovedMessageCount to IO	2024-05-28 12:57:50 +09:30
fanchao	f16735d4ee	Merge remote-tracking branch 'upstream/dev' into SES-2009-blinded-conversation	2024-05-28 13:20:03 +10:00
fanchao	5769c011bc	Catch cxx exception	2024-05-28 11:34:52 +10:00
Andrew	b757691334	Merge pull request #1493 from simophin/ses-1936-oom ... [SES-1936] Fix memory leaks	2024-05-28 11:04:41 +09:30
Andrew	b30506ff64	Merge pull request #1500 from bemusementpark/fix-merge-1.18.3 ... Fix merge master to dev for release-1.18.3	2024-05-28 09:55:08 +09:30
Andrew	193381e193	Fix merge master to dev for release-1.18.3	2024-05-27 18:50:49 +09:30
fanchao	35335480ca	Merge remote-tracking branch 'upstream/dev' into ses-1936-oom	2024-05-27 13:37:00 +10:00
fanchao	0d3a33e6c6	Fix delete message for everyone doesn't stop the audio playing	2024-05-27 13:25:56 +10:00
fanchao	2d7f23a2fb	More work on animation views	2024-05-27 13:18:51 +10:00
fanchao	c0128b88de	OOM feedback	2024-05-27 10:29:53 +10:00
Andrew	ca9786a43d	Merge pull request #1499 from bemusementpark/dev ... Merge master into dev	2024-05-24 12:52:03 +09:30
Andrew	9d22e86a2f	Merge master into dev	2024-05-24 12:03:52 +09:30
Andrew	455a1ed50a	Merge pull request #1495 from oxen-io/release-1.18.3 ... Merge release-1.18.3 to master	2024-05-24 10:19:01 +09:30
Andrew	f90cea8fe2	Do not fetch quotes recursively	2024-05-23 18:59:09 +09:30
fanchao	31f4de22cd	More changes	2024-05-23 14:17:38 +10:00
fanchao	c1d82cc574	Naming	2024-05-23 13:49:38 +10:00
fanchao	90f0caebbd	Tidy up	2024-05-23 13:48:06 +10:00
Andrew	8c9ff9840c	Move next button up on new message fragment	2024-05-22 20:46:20 +09:30
Andrew	98f279fdf7	Merge pull request #1496 from oxen-io/revert-attachment-download-list-mechanism ... [SES-1956] Attachment download job re-start preventer removed	2024-05-22 17:07:37 +09:30
alansley	f6fb4ab78c	Attachment download job re-start preventer removed	2024-05-22 17:04:44 +10:00
Andrew	2a73e944e7	Merge branch 'on' into on-2	2024-05-22 12:29:46 +09:30