Commit graph

250 commits

Author SHA1 Message Date
jubb 842cfc25a1 Merge branch 'dev' into trusted_attachment_download
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
2021-07-12 09:28:14 +10:00
jubb 9dfd051e63 feat: trust dialog and processing attachments for users after trusting them 2021-07-09 15:13:43 +10:00
Niels Andriesse dc790560fd Clean & debug 2021-07-09 13:56:38 +10:00
Niels Andriesse 9d447608da Re-organize files 2021-07-09 13:25:57 +10:00
Niels Andriesse c984d90b04 Re-organize files 2021-07-09 13:18:48 +10:00
Niels Andriesse 05cc6ea742 Re-enable copying Session IDs in closed groups & clean 2021-07-09 13:01:16 +10:00
Niels Andriesse 9fd2788664 Merge branch 'master' into dev 2021-07-09 09:25:16 +10:00
Niels Andriesse 004ea5b87a Fix various crashes 2021-07-09 09:24:43 +10:00
Niels Andriesse 0524d42f1a Merge branch 'dev' into security 2021-07-08 10:50:25 +10:00
Harris 683b5243bd fix: notify update for attachment's thread ID on setting audio extras 2021-07-07 14:56:53 +10:00
jubb 21c0537432 fix: pass original missing to the quote view to prevent image with no content rendering 2021-07-05 16:52:56 +10:00
jubb f4e5e5e36a fix: duplicate message send bug on attachments 2021-07-05 15:00:32 +10:00
jubb d57903aa44 fix: open group poller queues trim thread job only if received messages
deleting quotes should now propagate to set quote missing flag in MMS and update the UI accordingly
2021-07-05 09:59:54 +10:00
jubb 7459765a52 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-07-01 11:06:34 +10:00
jubb 758475f0dc fix: R.color.destructive on the error drawable in conversation and home adapter and handling message re-sending 2021-07-01 11:06:11 +10:00
Niels Andriesse 1fbb3d3dd5 Fix message deletion threading bug 2021-06-30 13:49:23 +10:00
Niels Andriesse 4989bf4b8b Fix threading issue 2021-06-30 13:15:39 +10:00
Niels Andriesse b2a66e9293 Add message status indicator 2021-06-22 15:41:14 +10:00
Niels Andriesse 2188200717 Merge branch 'dev' into ui 2021-06-16 10:19:52 +10:00
Brice-W 47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse ed6db6f4e7 Merge branch 'dev' into ui 2021-06-11 13:41:50 +10:00
Brice-W b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Brice-W 3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Harris 91aefb7c87 feat: upgrade to keystore sealed identity key preferences 2021-06-07 11:53:17 +10:00
Brice-W 1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
nielsandriesse b000be9037 Add isControlMessage convenience variable 2021-06-01 10:02:20 +10:00
nielsandriesse 7ab9d3d8dc Clean remaining message record classes 2021-05-31 16:26:46 +10:00
nielsandriesse 7e9116df9c Clean up MessageRecord 2021-05-31 16:20:46 +10:00
nielsandriesse 1952b0e3be Clean up DisplayRecord 2021-05-31 15:53:25 +10:00
jubb 72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
Niels Andriesse 49ee9b9991 Delete unnecessary transaction 2021-05-27 15:39:46 +10:00
Niels Andriesse 85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
jubb 468b8f25c5 refactor: improve docs 2021-05-27 11:06:47 +10:00
jubb efa36d4cea refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message
migrate TrimThreadJob.kt to new job system

deleting more open group references in removal

open group last message / last deletion now sets after processing vs after fetching
2021-05-26 15:22:19 +10:00
Niels Andriesse 5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse e674e40959 Experimental performance improvement 2021-05-24 16:10:27 +10:00
ryanzhao 25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse d7afcd07f8 Add contacts migration 2021-05-24 11:35:05 +10:00
Niels Andriesse e7ae08fe7a Clean 2021-05-24 10:27:31 +10:00
ryanzhao b186d4a670 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 09:19:56 +10:00
Niels Andriesse c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00
Niels Andriesse a4a11e8e5e Fix indentation 2021-05-21 15:09:50 +10:00
Niels Andriesse 49c3ffd9ca Remove redundant code 2021-05-21 15:02:34 +10:00
Ryan ZHAO 953f6d8c17 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-21 14:55:15 +10:00
Ryan ZHAO d52787a661 try to use jobs to mark if all open groups are caught up 2021-05-21 14:55:06 +10:00
Niels Andriesse ff96bb05a8 Implement remaining bits and pieces 2021-05-21 11:09:03 +10:00
Niels Andriesse 6829895995 Handle Kryo version incompatibility 2021-05-21 09:08:16 +10:00
jubb 1cc0b0ee7d refactor: don't delete empty threads if they're open groups 2021-05-20 15:43:29 +10:00