Commit Graph

86 Commits

Author SHA1 Message Date
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
jubb ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 2021-04-29 17:13:42 +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
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
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 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 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
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 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 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 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
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