7633 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Harris	d5244d91ac	Merge branch 'dev' 1.11.9	2021-09-06 14:14:58 +10:00
Harris	71d2c1d1df	build: update build numbers	2021-09-01 14:33:37 +10:00
Harris	6a36ae538d	Merge remote-tracking branch 'upstream/dev' into dev	2021-09-01 14:23:06 +10:00
Harris	7bcfb56127	build: adding latest strings	2021-09-01 13:56:11 +10:00
Harris	0120eb3fad	Merge pull request #714 from warrickct/quote-cutoff-fix ... Fixing quote cutoff when font is too large.	2021-08-31 06:14:33 +00:00
Harris	fdbc609b79	Merge remote-tracking branch 'upstream/dev' into dev	2021-08-31 14:22:30 +10:00
Harris	7c3dc7e7bc	refactor: instrumentation for clipboard test was failing on smaller screen devices running the tests	2021-08-31 14:21:48 +10:00
Warrick Corfe-Tan	0539ca412d	constrain min size for cancel button when drafting a quote reply.	2021-08-26 15:29:34 +10:00
Warrick Corfe-Tan	5936efea53	Fixing quote cutoff when font is too large.	2021-08-26 10:38:05 +10:00
Niels Andriesse	9fb644f734	Merge pull request #712 from hjubb/dev ... Fix muted notification dismissal	2021-08-20 16:53:59 +10:00
Harris	873fb6b578	fix: clear notifications properly on muted groups	2021-08-20 16:09:44 +10:00
Niels Andriesse	4bc9bdea73	Merge pull request #711 from hjubb/bottom_sheet_conversation ... Allow Messaging from User details sheet	2021-08-20 15:58:14 +10:00
Niels Andriesse	9ae5e0b04a	Merge pull request #709 from hjubb/conversation_camera_improvement ... Improved Conversation UX and Camera	2021-08-20 15:58:02 +10:00
Harris	b7ead5778e	refactor: revert inThreadNotification pref to default true	2021-08-19 14:16:54 +10:00
Harris	021d81ab98	refactor: alignment	2021-08-19 13:45:57 +10:00
Harris	7ac340b3ca	refactor: remove unused constant	2021-08-19 13:44:38 +10:00
Harris	ef8cdf3127	fix: handle bundling properly with the messageIdTag check	2021-08-19 12:24:28 +10:00
Harris	975076cb5c	fix: bundled notification no longer notifies on mentions only	2021-08-19 12:14:21 +10:00
Harris	1f3db80d36	fix: only show notification settings if the contact is not muted and a group	2021-08-18 12:15:49 +10:00
Harris	ea71334524	Merge remote-tracking branch 'upstream/dev' into conversation_camera_improvement	2021-08-18 12:12:02 +10:00
Harris	39d997a636	Merge pull request #703 from RyanRory/unsend-request ... Unsend Requests	2021-08-18 00:29:56 +00:00
ryanzhao	b03ba5bfa7	clean	2021-08-17 16:16:17 +10:00
ryanzhao	d9eb2c7585	don't show delete options for old messages	2021-08-17 15:11:53 +10:00
ryanzhao	ecc881bc7c	store server hash value for incoming messages	2021-08-17 14:34:49 +10:00
Niels Andriesse	b70c115d47	Merge pull request #705 from oxen-io/KeeJef-patch-1 ... Update Oxen Mentions & Remove FB Link	2021-08-17 13:48:45 +10:00
ryanzhao	c4a3463416	send unsend request to self only for delete locally	2021-08-17 12:17:40 +10:00
Kee Jefferys	679edc10d4	Update Oxen mentions, remove FB	2021-08-17 12:01:46 +10:00
ryanzhao	b9dd229207	add a flag to disable unsend requests	2021-08-16 15:09:12 +10:00
ryanzhao	144992d817	Merge branch 'dev' of https://github.com/oxen-io/session-android into unsend-request	2021-08-16 14:38:39 +10:00
Harris	88cbd58834	Merge pull request #701 from hjubb/conversation_improvements ... Fix quotes in multiple message types	2021-08-16 04:28:45 +00:00
Harris	dbec5ad53c	fix: fixing the message dismissal of notifications for threads upon activity resume. using media send activity's camera intent for consistency	2021-08-16 14:05:49 +10:00
ryanzhao	29e355c6ab	send unsend request as sync message	2021-08-16 14:03:06 +10:00
ryanzhao	e8551a3545	improve delete option ui	2021-08-16 12:08:35 +10:00
ryanzhao	4ce1bd6875	clean	2021-08-16 11:59:52 +10:00
ryanzhao	feff1c8393	fix cancel notification	2021-08-16 10:58:07 +10:00
ryanzhao	f10ddb8e3a	cancel notification for unsend request	2021-08-16 10:34:28 +10:00
ryanzhao	ee3e9ae17f	delete outgoing message for linked device	2021-08-16 09:58:28 +10:00
ryanzhao	064e509992	fix a minor issue for closed group	2021-08-13 16:33:30 +10:00
ryanzhao	cb59a1af2d	minor fix	2021-08-13 15:49:05 +10:00
ryanzhao	aad58043d3	add UI options for delete messages	2021-08-13 15:30:26 +10:00
Harris	266ed2fa78	feat: allow opening conversation thread from UserDetailsBottomSheet.kt ... refactor the copy button logic to occur when long pressing the Session ID text to fix #517	2021-08-12 17:50:35 +10:00
ryanzhao	4f89c33676	fix a issue that the unread count can be negative	2021-08-12 16:37:53 +10:00
Harris	7e791d63dc	fix: other view types have clickable links, clickable links in the long message. Ordering of highlight mentions before getting clickable spans ... fixes #664	2021-08-12 15:36:08 +10:00
ryanzhao	9dcc5dd848	disable interaction for deleted messages	2021-08-12 15:01:48 +10:00
ryanzhao	9ab285c3be	handle home screen update for unsend request	2021-08-12 14:14:37 +10:00
ryanzhao	8b6b02911f	handle database for message deleted by unsend request	2021-08-12 11:43:33 +10:00
ryanzhao	23a61299ac	bind deleted message view	2021-08-11 16:35:48 +10:00
ryanzhao	77b5b3ab01	deleted message bubble ui	2021-08-11 15:36:13 +10:00
ryanzhao	0000aa0d13	delete locally after successfully delete remotely	2021-08-11 15:24:33 +10:00
ryanzhao	af6c19690b	send unsend request & delete remotely	2021-08-11 15:17:53 +10:00