Commit Graph

385 Commits (a0e186e8f61e9adc4f43fc62472941925200d37f)

Author SHA1 Message Date
Ryan ZHAO 267a94b8ef minor fix 4 years ago
ryanzhao 46a01010e1 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
nielsandriesse c5e0589751 Don't crash on unexpected deserialization error 5 years ago
nielsandriesse bb850cf99e Minor job type refactoring 5 years ago
nielsandriesse f5238982c3 Add missing message padding 5 years ago
nielsandriesse 174bccb0b7 Fix missing signature validation 5 years ago
ryanzhao 1e3ff1e6a1 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
ryanzhao 4c63b724ee make editting nickname work 5 years ago
nielsandriesse c8cf5ebfa0 Make custom error messages actually work 5 years ago
nielsandriesse d8932416f1 Minor V2 open group refactoring 5 years ago
nielsandriesse fa5edcefd5 Minor message type refactoring 5 years ago
Ryan ZHAO b43000bdd0 WIP: enable contact with UI 5 years ago
Ryan ZHAO be3b8a4b7e Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
Ryan ZHAO a16e67d1fd add new contact database api 5 years ago
jubb e7377d640f fix: use AttachmentUploadJob instead of two download job keys in all types 5 years ago
jubb d707433f28 docs: remove no long applicable docs 5 years ago
jubb ccd9493f62 refactor: remove unlimited by array size and cap at 10_000_000 5 years ago
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 5 years ago
Ryan ZHAO cbd6ae3bcb Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
Niels Andriesse 3c3f6c25f1 Fix various bugs 5 years ago
jubb a4b7b34f2e refactor: change request to use default pubkey 5 years ago
jubb 704723ed80 feat: add removing of the sent/received messages 5 years ago
jubb 50d3b52617 refactor: remove unused download in DotNetAPI.kt and add todo for upload migration 5 years ago
jubb 14a02a8511 fix: proper sending of join URL and removing server timestamp in proto parsing 5 years ago
jubb e8bac5005e feat: file server v2 and syncing open groups v2 in config messages 5 years ago
jubb 35aec04ac9 feat: member counts in v2 open group ConversationActivity 5 years ago
jubb d8e9e372d3 fix: add support for non-standard ports in opengroupv2 5 years ago
jubb f3fa8626ed feat: compact polling server-wide 5 years ago
jubb c102c5132e fix: don't use testnet 5 years ago
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
5 years ago
jubb fe8dc2d392 fix: slight UI and handling protocols at onion request level 5 years ago
jubb 2999c138aa feat: add open group display name hex suffix 5 years ago
jubb a58332a353 refactor: increase max poll time 5 years ago
jubb 7e14a315b9 refactor: compact polling and usage based polling 5 years ago
Ryan ZHAO e64ac14b77 fix crash & empty nickname bug 5 years ago
jubb 460babe930 fix: deletion fixed up 5 years ago
jubb ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 5 years ago
Ryan ZHAO a1edfb13ee Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
Ryan ZHAO a7c7d0c10f introduce Contact model 5 years ago
Ryan ZHAO 496e833333 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 5 years ago
Brice-W 1f62990aff fix polling issue in closed groups 5 years ago
Niels Andriesse f727244342
Merge pull request #514 from oxen-io/refactoring
Minor Refactoring
5 years ago
Niels Andriesse 761c12addd Clean 5 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
5 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
5 years ago
Brice-W ab68001b15 clean 5 years ago
jubb 9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 5 years ago
Brice-W 54ba848d09 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 5 years ago
nielsandriesse 97c74bb3dc Fix polling 5 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
5 years ago