Commit Graph

297 Commits

Author SHA1 Message Date
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
Brice-W 7aa1f30c98 fix 2021-04-20 17:07:21 +10:00
Brice-W 3bfef2d0cd e UpdateMessageBuilder to generate data extraction message 2021-04-20 16:55:46 +10:00
Brice-W 66e811ed75 Merge branch 'specific-group-updates' into data-extraction-2 2021-04-20 15:42:04 +10:00
jubb aea23a6fc1 feat: finishing up OpenGroupAPIV2.kt calls 2021-04-19 10:16:38 +10:00
jubb 96e604d06b feat: more opengroup in chat manager, poller and API. refactor mentions to libsession 2021-04-15 17:17:55 +10:00
Brice-W abb1db7a7e new approach in update saving 2021-04-15 14:41:29 +10:00
Brice-W 9cdcdc43a6 redesign of group update messages management 2021-04-14 16:37:04 +10:00
jubb 0eadc55325 feat: add open group v2 storage and db methods, starting on new open group v2 poller 2021-04-13 17:17:16 +10:00
Brice-W df0ca11ec5 Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-04-12 14:26:13 +10:00
Brice-W db415f371a Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2 2021-04-09 16:30:36 +10:00
Brice-W e57c697eca finishing data extraction handling 2021-04-09 16:06:12 +10:00
Brice-W fce1d60d7d clean 2021-04-08 15:40:00 +10:00
Brice-W 8df7d2bb49 clean 2021-04-08 15:27:25 +10:00
Brice-W 30b47a32cb Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-04-08 15:21:46 +10:00
Brice-W d027d0c640 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2 2021-04-08 15:00:31 +10:00
Brice-W dd3d962dea fix expiration timers updates for groups 2021-04-08 12:07:23 +10:00
Brice-W 04f295ac6c expiration timer updates handled as outgoing messages for multi device 2021-04-07 10:40:45 +10:00
Brice-W fe47a6e958 manage duplicates outgoing messages 2021-04-01 15:48:35 +11:00
jubb 20b5da18fe feat: lower debounce period 2021-04-01 11:51:39 +11:00
jubb 7121aa85fb refactor: use OpenGroupAPI.kt instead of PublicChatAPI.kt for all open group operations.
Syncing open group notify conversation list listeners debounced so UI doesn't freeze on initial syncs
2021-03-31 15:15:50 +11:00
jubb 3654d1731c fix: various fixes wrt open groups, config messages, job queueing 2021-03-30 16:23:12 +11:00
jubb c3f7425ccd fix: empty messages in open groups now correct properly 2021-03-29 16:40:56 +11:00
jubb d292c760c4 Merge branch 'refactor-sending' of github.com:hjubb/session-android into origin/refactor-sending 2021-03-29 14:16:58 +11:00
jubb db553544ec fix: open group fixes for new message receive pipeline 2021-03-29 14:16:49 +11:00
Brice-W 8bc6df5d16 fix multi device attachment issue 2021-03-29 13:52:36 +11:00
jubb 196a0205ae refactor: revert expiry to be recipient based instead of message based 2021-03-25 15:12:55 +11:00
jubb bdc086cacf fix: use message's expiry instead of the recipient's 2021-03-25 14:11:58 +11:00
jubb 611b272493 fix: attachments for quotes no longer doubled up 2021-03-24 17:17:01 +11:00
jubb fad8cd5ba6 fix: changing the way received timestamp handling happens 2021-03-23 15:56:15 +11:00
jubb a60ec8aaef fix: fix compile error 2021-03-23 11:15:25 +11:00
jubb 7f5f1e4559 Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
2021-03-23 11:13:00 +11:00
Brice-W 1b01d0afd4 clean 2021-03-23 11:03:09 +11:00
Brice-W 68a3c73ab1 clean 2021-03-23 10:59:03 +11:00
Brice-W 5f297835fa Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2 2021-03-23 10:57:13 +11:00
jubb 6f2bad9b59 fix: no duplicate group left messages, more efficient closed group polling 2021-03-23 10:00:51 +11:00
Brice-W 28cecc0236 expiration timer messages generation updated 2021-03-23 09:58:17 +11:00
Brice-W 24b4fb0665 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2 2021-03-22 15:18:14 +11:00
Brice-W 0578195d61 Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-03-22 15:12:09 +11:00
jubb 8ee58459dd feat: use new closed and open group pollers 2021-03-19 17:08:31 +11:00
Brice-W a47113f2c5 revert changes 2021-03-19 16:57:00 +11:00
Brice-W 5dcb3d77d4 revert changes regarding explicit group updates as it's now in a separate PR 2021-03-19 16:39:41 +11:00
Brice-W ddede475b4 Start of Update messages builder class implementation & usage for Input group updates 2021-03-19 16:25:00 +11:00
jubb b685846d7e Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
#	libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt
2021-03-18 09:26:13 +11:00
Ryan ZHAO 95646ed04e make error description show in the message detail activity 2021-03-16 16:31:52 +11:00
Brice-W 471e028cf3 implementation of the receiving side of Data Extraction notifications & explicit group updates notifications 2021-03-16 14:56:47 +11:00
jubb 6508873e57 fix: fix the sent / receive timestamps for linking quotes 2021-03-15 15:03:23 +11:00
Ryan ZHAO d2843b2cef fix removing jobs in database 2021-03-15 14:56:46 +11:00
jubb 817c40b30c refactor: inserting attachments with the messages so that they are linked properly to a mmsID 2021-03-15 13:35:05 +11:00
jubb 323fb75149 fix: adding some message receive functionality 2021-03-12 17:15:33 +11:00
Ryan ZHAO 54da77a89b clean 2021-03-12 15:23:29 +11:00
Ryan ZHAO 91f9138d62 clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
Ryan ZHAO 60f51af295 clean & fix expiration timer setting issue 2021-03-12 11:27:51 +11:00
Ryan ZHAO 2859da01a7 fix duplicated closed group info message 2021-03-11 15:31:14 +11:00
Ryan ZHAO 42c7f440e9 fix quoting message in open groups 2021-03-11 14:37:53 +11:00
Ryan ZHAO 70a7182320 Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor-sending 2021-03-09 14:46:14 +11:00
Ryan ZHAO 1a6da88ce3 clean 2021-03-09 13:54:15 +11:00
Ryan ZHAO 0a7fecfb52 fix sending link preview 2021-03-09 10:50:02 +11:00
Ryan ZHAO 4218073a69 fix quote attachments 2021-03-05 13:31:40 +11:00
jubb 4f74d46b17 fix: revert query to filter empty threads for now 2021-03-05 13:17:08 +11:00
Ryan ZHAO 3b2ea4e95d clean 2021-03-05 11:31:12 +11:00
Ryan ZHAO 2df9d4f27c clean 2021-03-05 11:24:43 +11:00
Ryan ZHAO 2426230064 fix sending profile picture update 2021-03-05 11:13:25 +11:00
jubb 784e217e91 feat: filter out local number empty thread only 2021-03-04 17:17:45 +11:00
jubb 27958491c5 fix: specific empty thread snippet and removing the thread filtering for empty messages 2021-03-04 16:21:25 +11:00
Ryan ZHAO 0ea1ed15e7 WIP: make attachment work 2021-03-02 17:22:56 +11:00
Ryan ZHAO bb7334515c clean 2021-03-02 14:13:52 +11:00
Ryan ZHAO 8acbb3c366 fix send text message to open group 2021-03-02 14:13:12 +11:00
Ryan ZHAO d9eaedd6ae hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
jubb 3a09d23337 feat: add contact syncing, UI improvements for profile syncing and conversation threads in the home screen 2021-03-01 17:16:15 +11:00
Ryan ZHAO d5343d5462 Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-24 16:39:04 +11:00
Ryan ZHAO 6f002311b8 clean up unused message types 2021-02-23 16:23:45 +11:00
Ryan ZHAO ff36fbb6a1 further cleaning up on stickers 2021-02-23 15:07:31 +11:00
jubb f61b556790 fix: message ordering using NORMALIZED_DATE_SENT instead of NORMALIZED_DATE_RECEIVED 2021-02-23 14:41:21 +11:00
Ryan ZHAO 2f57090cfa further clean up on session restoration 2021-02-23 11:56:03 +11:00
Ryan ZHAO 12a2061251 clean up jobs 2021-02-23 11:29:07 +11:00
Ryan ZHAO 5db7f0ecb8 clean up signal database 2021-02-23 09:46:56 +11:00
Ryan ZHAO 861b4bf9c9 further clean up unused connections 2021-02-22 16:54:57 +11:00
Ryan ZHAO c5ab13aadf clean up deprecated message connection 2021-02-22 16:29:48 +11:00
Ryan ZHAO 5b15decdd6 further cleaning on signal sticker 2021-02-22 15:07:16 +11:00
Ryan ZHAO 0ec940ea32 clean up location 2021-02-22 13:30:48 +11:00
Ryan ZHAO 19a829d011 WIP: clean up signal protocols (stickers) 2021-02-22 10:06:40 +11:00
Ryan ZHAO d8104c0d5c WIP: clean up signal protocol storage 2021-02-19 15:11:30 +11:00
Niels Andriesse 6bee97a682
Merge pull request #443 from RyanRory/multi_device_refactor
The Refactor: Multi Device & Closed Group
2021-02-19 13:49:06 +11:00
Ryan ZHAO 958ec690f1 WIP: clean up signal protocols 2021-02-19 11:03:58 +11:00
Ryan ZHAO 9d0831b874 remove shared sender keys 2021-02-18 14:14:05 +11:00
Ryan ZHAO 568fddf91d remove ClosedGroupUpdateMessageSendJob in database 2021-02-18 10:59:31 +11:00
Ryan ZHAO b85c9eb781 Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor_clean_0 2021-02-18 10:48:12 +11:00
Niels Andriesse f45a285141 Update version number 2021-02-18 10:30:21 +11:00
Ryan ZHAO 20ec889730 clean up V1 closed group 2021-02-17 16:09:36 +11:00
Ryan ZHAO 37cb4cd28c Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-17 11:53:29 +11:00
nielsandriesse 362e24f98c Fix DB migration 2021-02-17 11:36:56 +11:00
nielsandriesse 7f4603a1ba Fix DB migration 2021-02-17 11:30:37 +11:00
nielsandriesse 5226947e0a Fix DB migration 2021-02-17 11:08:57 +11:00
Ryan ZHAO b517555a45 timestamp & duplicated message 2021-02-16 15:24:21 +11:00
Ryan ZHAO c6084b0172 replace group create at timestamp with formation timestamp 2021-02-16 11:14:27 +11:00
Ryan ZHAO a7764ed5c9 Merge branch 'testing_multi_merge' of https://github.com/hjubb/session-android into multi_device_refactor 2021-02-16 09:26:55 +11:00
jubb 83d107cbce fix: compare serialized to serialized 2021-02-12 14:28:25 +11:00
Ryan ZHAO 5dadb89225 WIP: received message timestamps 2021-02-11 16:09:59 +11:00
Ryan ZHAO 5cbbf92fb9 sync target of multi device for refactored sending & receiving pipeline 2021-02-11 15:00:27 +11:00
jubb 5a892b2932 Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
#	libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java
2021-02-11 14:12:22 +11:00