Commit Graph

6914 Commits (da331b036e6899da0a5e37a4f32345ee6aee28b2)
 

Author SHA1 Message Date
Niels Andriesse b69df4750b
Merge pull request #515 from Brice-W/group-polling
Group polling issue
4 years ago
Ryan ZHAO b23144cb1a Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 4 years ago
Ryan ZHAO 4508510958 fix for API 21 4 years ago
Brice-W 1f62990aff fix polling issue in closed groups 4 years ago
Niels Andriesse f727244342
Merge pull request #514 from oxen-io/refactoring
Minor Refactoring
4 years ago
Niels Andriesse a822c74ecc Use global Kovenant config 4 years ago
Niels Andriesse 024e2d1253
Merge pull request #511 from hjubb/fix_profile_nulls
Fix profile nulls
4 years ago
Niels Andriesse 761c12addd Clean 4 years ago
jubb d05da5c447 Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
4 years ago
Niels Andriesse 6a116100ae
Merge pull request #512 from Brice-W/closed-groups-update
Closed groups update
4 years ago
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
4 years ago
Brice-W ab68001b15 clean 4 years ago
ryanzhao d0d4d9eb6f Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 4 years ago
ryanzhao 01eb7945f6 fix crash 4 years ago
jubb 9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 4 years ago
Brice-W 54ba848d09 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 4 years ago
nielsandriesse 97c74bb3dc Fix polling 4 years ago
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
4 years ago
Brice-W 8806fd0462 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 4 years ago
Brice-W a5e376b616 import of Signal's code to deal with attachments saving 4 years ago
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
4 years ago
Niels Andriesse 366276fe20
Merge pull request #503 from oxen-io/hardfork
Update for Hardfork Changes
4 years ago
Niels Andriesse a14fc0503f Take care of remaining loose ends 4 years ago
Niels Andriesse e2ad23482d Resolve various loose ends 4 years ago
Niels Andriesse 7150374c94 Clean 4 years ago
jubb 11aed5daff refactor: don't update profile if it is user's at all in visible message handling, leave it to config updates 4 years ago
jubb d3bd844d82 fix: re-import getLong and turn off optimize imports 4 years ago
Brice-W d4aaebd0a9 don't show zombie members in group remove updates 4 years ago
jubb 96cc867512 fix: BackgroundPollWorker.kt new instance instead of null instance 4 years ago
jubb 42ca1332ec fix: update prof pic and name and use new profile instead of existing recipient 4 years ago
Brice-W 6a32fabda5 revert change of commit 7c6475d9ee 4 years ago
jubb 572f262b6d fix: don't update the profiles if the values are empty 4 years ago
jubb 4bf0990ef9 feat: open group attachment and message processing 4 years ago
Brice-W f0394fb908 fix avatar display issues 4 years ago
Niels Andriesse 07fe672f31 Clean 4 years ago
Brice-W 7c6475d9ee EncryptionKeyPair: only set a public key for 1-1 message case 4 years ago
Niels Andriesse fdede1c656 Clean 4 years ago
Niels Andriesse 69f05dabdf Clean 4 years ago
Niels Andriesse 17e764fc31 Clean 4 years ago
Niels Andriesse 25307068e8 Match iOS protobuf 4 years ago
Niels Andriesse 676c307412 Clean 4 years ago
Niels Andriesse bc66c45bca Clean 4 years ago
jubb 6272856ef9 feat: syncing / joining / leaving working on open group v2 4 years ago
Brice-W 15707b7060 fix encryption key pair handling 4 years ago
Niels Andriesse 7415c728eb Merge branch 'hardfork' of github.com:oxen-io/session-android into hardfork 4 years ago
Niels Andriesse 979c21ccbf Fix duplicated API 4 years ago
Brice-W b064f8f5d7 implementation of the zombie members handling logic 4 years ago
Brice-W 3e4a6a9df4 Merge branch 'hardfork' of https://github.com/loki-project/session-android into closed-groups-update 4 years ago
jubb a4d79ea2d3 feat: join groups logic 4 years ago
Niels Andriesse f21ad17dd5 Merge branch 'dev' into hardfork 4 years ago