Commit Graph

6847 Commits (7c3bee036c400eff7882b24377460e9cad9c8f07)
 

Author SHA1 Message Date
Niels Andriesse 2f23a0e59f Merge branch 'dev' 4 years ago
Niels Andriesse cc7e4701a3 Increment database version 4 years ago
Niels Andriesse 3c3f6c25f1 Fix various bugs 4 years ago
Niels Andriesse bfa75a3db9
Merge pull request #524 from hjubb/file_server_v2
New File Server V2 URL handling and open group v2 fixes / features
4 years ago
jubb a4b7b34f2e refactor: change request to use default pubkey 4 years ago
jubb 704723ed80 feat: add removing of the sent/received messages 4 years ago
Niels Andriesse 54d64192fb Update version number 4 years ago
jubb 50d3b52617 refactor: remove unused download in DotNetAPI.kt and add todo for upload migration 4 years ago
jubb 14a02a8511 fix: proper sending of join URL and removing server timestamp in proto parsing 4 years ago
jubb e8bac5005e feat: file server v2 and syncing open groups v2 in config messages 4 years ago
Niels Andriesse facd3616fb
Merge pull request #518 from hjubb/open_groups_V2
Open groups v2
4 years ago
jubb 35aec04ac9 feat: member counts in v2 open group ConversationActivity 4 years ago
jubb d8e9e372d3 fix: add support for non-standard ports in opengroupv2 4 years ago
jubb f3fa8626ed feat: compact polling server-wide 4 years ago
jubb 2eb612a967 feat: remove cleartext enabled 4 years ago
jubb c102c5132e fix: don't use testnet 4 years ago
jubb a2290a34fc feat: add polling in background 4 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
4 years ago
jubb fe8dc2d392 fix: slight UI and handling protocols at onion request level 4 years ago
Niels Andriesse e874032e1e
Merge pull request #509 from RyanRory/screenlock-timeout
Screenlock Time under 60s
4 years ago
Brice-W bb25877515 light refactor + OpenGroupUrlParser implementation & unit test 4 years ago
jubb 2999c138aa feat: add open group display name hex suffix 4 years ago
jubb a58332a353 refactor: increase max poll time 4 years ago
jubb 7e14a315b9 refactor: compact polling and usage based polling 4 years ago
Brice-W 9ee167c173 handleOpenGroupInvitation skeleton added + region added 4 years ago
Brice-W 99a62d9e99 adding openGroupInvitation types in proto & class 4 years ago
jubb 460babe930 fix: deletion fixed up 4 years ago
jubb b70908e61a fix: gotta fix some more up 4 years ago
jubb ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 4 years ago
Brice-W 6d29c5b8dc removing call to deprecated method getExternalStoragePublicDirectory 4 years ago
Ryan ZHAO 2c85fbf91b Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 4 years ago
Brice-W 76c253ee77 Merge branch 'dev' of https://github.com/loki-project/session-android into media-saving 4 years ago
Niels Andriesse 43c484e35f Clean 4 years ago
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