Commit Graph

297 Commits

Author SHA1 Message Date
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
jubb fdc042e6d4 feat: testnet clearing network data on delete and differentiating dialogs 2021-06-18 16:01:34 +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
Ryan ZHAO 563a13d208 fix nickname usage & clean 2021-05-20 14:06:42 +10:00
Ryan ZHAO 38ed5c2187 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 11:15:24 +10:00
nielsandriesse 7ba116c1df Switch to new open group manager 2021-05-19 11:12:29 +10:00
nielsandriesse 2a3d06e485 Fix duplicate message handling 2021-05-19 08:56:44 +10:00
Niels Andriesse 6243443262 Move files 2021-05-18 16:11:38 +10:00
Niels Andriesse 4078a9c4b5 Move files 2021-05-18 16:03:47 +10:00
Niels Andriesse ab83e49f93 Remove duplicated/unused code 2021-05-18 15:55:24 +10:00
Niels Andriesse c1548a4e51 Move files 2021-05-18 09:50:16 +10:00
Niels Andriesse dc8938c269 Move protos 2021-05-18 09:44:06 +10:00
Niels Andriesse c9ebcc580f Move files 2021-05-18 09:26:08 +10:00
Niels Andriesse 40d2fd25d9 Move files 2021-05-18 09:21:56 +10:00
Niels Andriesse a88322a033 Move files 2021-05-18 09:12:33 +10:00
Niels Andriesse 6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +10:00
Niels Andriesse 11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
Brice-W f5a99b43c7 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-14 10:32:12 +10:00
Niels Andriesse d9348c5442 Remove weird roundabout way of doing decryption 2021-05-13 15:27:08 +10:00
Niels Andriesse 3e1727fdbc Debug 2021-05-13 13:34:35 +10:00
Ryan ZHAO b5dbec836c Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-13 10:25:52 +10:00
Niels Andriesse 43ba829977 Fix build 2021-05-13 09:40:07 +10:00
Niels Andriesse 3cab81c329 Fix message send job attachment upload handling 2021-05-13 09:38:39 +10:00
jubb edc1454609 fix: unnamed open groups being processed by creating new threads after deletion
job db not marking successful/unsuccessful properly

handling send and receive better / in order
2021-05-12 16:48:18 +10:00
ryanzhao 1e3ff1e6a1 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-12 15:11:18 +10:00
nielsandriesse d8932416f1 Minor V2 open group refactoring 2021-05-12 14:48:13 +10:00
Brice-W f51268b587 open group invitation sending part 2021-05-12 13:41:00 +10:00
Brice-W 2a436edbf8 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-12 08:41:12 +10:00
Brice-W b2a924ebf8 views created + database storage 2021-05-12 08:40:10 +10:00
Ryan ZHAO be3b8a4b7e Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-07 16:31:54 +10:00
Ryan ZHAO a16e67d1fd add new contact database api 2021-05-07 16:31:46 +10:00
jubb 4fff5ac2dc refactor: make storage reference jobId by string in deletion, don't persist jobs we are about to delete, delete jobs that fail to serialize from storage (probably from corrupt or moved data classes) in temporary message send jobs 2021-05-07 11:48:03 +10:00
Ryan ZHAO cbd6ae3bcb Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-07 10:33:27 +10:00
Niels Andriesse cc7e4701a3 Increment database version 2021-05-06 16:03:45 +10:00
Niels Andriesse 3c3f6c25f1 Fix various bugs 2021-05-06 15:46:22 +10:00
jubb 704723ed80 feat: add removing of the sent/received messages 2021-05-06 13:28:58 +10:00
jubb e8bac5005e feat: file server v2 and syncing open groups v2 in config messages 2021-05-05 17:29:27 +10:00
jubb 35aec04ac9 feat: member counts in v2 open group ConversationActivity 2021-05-05 13:52:15 +10:00
jubb fa528c47d5 Merge remote-tracking branch 'upstream/dev' into open_groups_V2
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
#	libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
#	libsession/src/main/java/org/session/libsession/utilities/mentions/Mention.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/utilities/mentions/Mention.kt
2021-05-03 15:37:53 +10:00
Ryan ZHAO 9afa0d5886 fix the name won't update for the first message 2021-04-30 16:00:33 +10:00
jubb ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 2021-04-29 17:13:42 +10:00
Ryan ZHAO 496e833333 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-04-29 13:29:12 +10:00
Niels Andriesse 761c12addd Clean 2021-04-29 10:02:07 +10:00
jubb 51554f1cdf Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt
#	libsession/src/main/java/org/session/libsession/utilities/mentions/MentionsManager.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/api/SwarmAPI.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/api/opengroups/PublicChat.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/utilities/mentions/MentionsManager.kt
2021-04-28 17:41:30 +10:00
Brice-W ab68001b15 clean 2021-04-28 16:00:13 +10:00
jubb 9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 2021-04-28 14:46:50 +10:00
jubb 7f0962b3d4 Merge branch 'fix_profile_nulls' into open_groups_V2
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
2021-04-28 13:53:50 +10:00
Brice-W 8806fd0462 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 09:42:02 +10:00
jubb 5d8f036f82 fix: attachment downloads and uploads
enable multi-threaded attachment handling for messages to speed up download/upload and free up message processing queue.

leaving group removes appropriate entries now in threaddb
2021-04-27 17:29:37 +10:00
jubb 4bf0990ef9 feat: open group attachment and message processing 2021-04-26 14:30:51 +10:00
Niels Andriesse 69f05dabdf Clean 2021-04-26 11:23:09 +10:00
Niels Andriesse 17e764fc31 Clean 2021-04-26 11:14:45 +10:00
Brice-W b064f8f5d7 implementation of the zombie members handling logic 2021-04-23 14:07:10 +10:00
Ryan ZHAO d78dc83307 minor refactor on storing display names 2021-04-22 10:48:19 +10:00
Niels Andriesse 9f26436041
Merge pull request #508 from Brice-W/data-extraction-2
Data extraction notifications
2021-04-21 13:44:46 +10:00
Brice-W 99fa7eb767 added specific UpdateMessageData.King types 2021-04-21 12:00:25 +10:00