5d9957a57d
Fix merge
3 years ago
25df4330be
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
3 years ago
e7ae08fe7a
Clean
3 years ago
b186d4a670
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
3 years ago
c0f894e1b2
Clean
3 years ago
e0c1456af4
Merge branch 'dev' into nicknames
3 years ago
a4a11e8e5e
Fix indentation
3 years ago
49c3ffd9ca
Remove redundant code
3 years ago
953f6d8c17
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
3 years ago
d52787a661
try to use jobs to mark if all open groups are caught up
3 years ago
ff96bb05a8
Implement remaining bits and pieces
3 years ago
563a13d208
fix nickname usage & clean
3 years ago
38ed5c2187
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
7ba116c1df
Switch to new open group manager
3 years ago
2a3d06e485
Fix duplicate message handling
3 years ago
6243443262
Move files
3 years ago
4078a9c4b5
Move files
3 years ago
c1548a4e51
Move files
3 years ago
c9ebcc580f
Move files
3 years ago
40d2fd25d9
Move files
3 years ago
6b3aa86324
Minor refactoring
3 years ago
11e223f5d8
Merge branch 'dev' into open-group-invitations
3 years ago
f5a99b43c7
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
3 years ago
d9348c5442
Remove weird roundabout way of doing decryption
3 years ago
b5dbec836c
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
43ba829977
Fix build
3 years ago
3cab81c329
Fix message send job attachment upload handling
3 years ago
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
3 years ago
1e3ff1e6a1
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
d8932416f1
Minor V2 open group refactoring
3 years ago
2a436edbf8
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
3 years ago
b2a924ebf8
views created + database storage
3 years ago
be3b8a4b7e
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
a16e67d1fd
add new contact database api
3 years ago
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
3 years ago
cbd6ae3bcb
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
704723ed80
feat: add removing of the sent/received messages
3 years ago
e8bac5005e
feat: file server v2 and syncing open groups v2 in config messages
3 years ago
35aec04ac9
feat: member counts in v2 open group ConversationActivity
3 years ago
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
3 years ago
ef19c0d10e
fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished
3 years ago
496e833333
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
3 years ago
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
3 years ago
9d4a2d1505
fix: NPE in highlighting messages for OGv2, deletion and moderation working
3 years ago
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
3 years ago
8806fd0462
Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update
3 years ago
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
3 years ago
4bf0990ef9
feat: open group attachment and message processing
3 years ago
69f05dabdf
Clean
3 years ago
17e764fc31
Clean
3 years ago
Niels Andriesse
ryanzhao
Brice-W
jubb