oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
6753 commits 3 branches 878 tags 462 MiB
Commit graph

6753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan ZHAO cbd6ae3bcb Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-07 10:33:27 +10:00
Niels Andriesse 2f23a0e59f Merge branch 'dev' 2021-05-06 16:06:04 +10:00
Niels Andriesse cc7e4701a3 Increment database version 2021-05-06 16:03:45 +10:00
Niels Andriesse 3c3f6c25f1 Fix various bugs 2021-05-06 15:46:22 +10:00
Niels Andriesse bfa75a3db9
Merge pull request #524 from hjubb/file_server_v2 
New File Server V2 URL handling and open group v2 fixes / features
 2021-05-06 14:03:31 +10:00
jubb a4b7b34f2e refactor: change request to use default pubkey 2021-05-06 13:48:35 +10:00
jubb 704723ed80 feat: add removing of the sent/received messages 2021-05-06 13:28:58 +10:00
Niels Andriesse 54d64192fb Update version number 2021-05-06 13:20:50 +10:00
jubb 50d3b52617 refactor: remove unused download in DotNetAPI.kt and add todo for upload migration 2021-05-05 17:50:29 +10:00
jubb 14a02a8511 fix: proper sending of join URL and removing server timestamp in proto parsing 2021-05-05 17:46:53 +10:00
jubb e8bac5005e feat: file server v2 and syncing open groups v2 in config messages 2021-05-05 17:29:27 +10:00
Niels Andriesse facd3616fb
Merge pull request #518 from hjubb/open_groups_V2 
Open groups v2
 2021-05-05 14:33:38 +10:00
jubb 35aec04ac9 feat: member counts in v2 open group ConversationActivity 2021-05-05 13:52:15 +10:00
jubb d8e9e372d3 fix: add support for non-standard ports in opengroupv2 2021-05-04 15:52:08 +10:00
jubb f3fa8626ed feat: compact polling server-wide 2021-05-04 14:51:21 +10:00
jubb 2eb612a967 feat: remove cleartext enabled 2021-05-04 09:08:21 +10:00
jubb c102c5132e fix: don't use testnet 2021-05-04 09:06:59 +10:00
jubb a2290a34fc feat: add polling in background 2021-05-03 17:58:11 +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 fe8dc2d392 fix: slight UI and handling protocols at onion request level 2021-05-03 15:21:53 +10:00
Niels Andriesse e874032e1e
Merge pull request #509 from RyanRory/screenlock-timeout 
Screenlock Time under 60s
 2021-05-03 14:59:50 +10:00
jubb 2999c138aa feat: add open group display name hex suffix 2021-05-03 11:29:04 +10:00
jubb a58332a353 refactor: increase max poll time 2021-04-30 16:57:06 +10:00
jubb 7e14a315b9 refactor: compact polling and usage based polling 2021-04-30 16:56:39 +10:00
Ryan ZHAO 51249d942d make the cancel button clean the nickname in database 2021-04-30 16:08:27 +10:00
Ryan ZHAO 9afa0d5886 fix the name won't update for the first message 2021-04-30 16:00:33 +10:00
Ryan ZHAO e64ac14b77 fix crash & empty nickname bug 2021-04-30 15:36:50 +10:00
jubb 460babe930 fix: deletion fixed up 2021-04-30 14:19:37 +10:00
jubb b70908e61a fix: gotta fix some more up 2021-04-29 17:28:41 +10:00
jubb ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 2021-04-29 17:13:42 +10:00
Ryan ZHAO 2c85fbf91b Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 2021-04-29 14:59:37 +10:00
Ryan ZHAO a1edfb13ee Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-04-29 14:59:14 +10:00
Ryan ZHAO a7c7d0c10f introduce Contact model 2021-04-29 14:59:04 +10:00
Niels Andriesse 43c484e35f Clean 2021-04-29 13:41:43 +10:00
Ryan ZHAO 496e833333 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-04-29 13:29:12 +10:00
Niels Andriesse b69df4750b
Merge pull request #515 from Brice-W/group-polling 
Group polling issue
 2021-04-29 13:27:22 +10:00
Ryan ZHAO b23144cb1a Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 2021-04-29 13:23:16 +10:00
Ryan ZHAO 4508510958 fix for API 21 2021-04-29 13:23:02 +10:00
Brice-W 1f62990aff fix polling issue in closed groups 2021-04-29 13:10:18 +10:00
Niels Andriesse f727244342
Merge pull request #514 from oxen-io/refactoring 
Minor Refactoring
 2021-04-29 10:11:02 +10:00
Niels Andriesse a822c74ecc Use global Kovenant config 2021-04-29 10:10:41 +10:00
Niels Andriesse 024e2d1253
Merge pull request #511 from hjubb/fix_profile_nulls 
Fix profile nulls
 2021-04-29 10:03:12 +10:00
Niels Andriesse 761c12addd Clean 2021-04-29 10:02:07 +10:00
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
 2021-04-29 09:39:33 +10:00
Niels Andriesse 6a116100ae
Merge pull request #512 from Brice-W/closed-groups-update 
Closed groups update
 2021-04-29 09:36:47 +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
Brice-W ab68001b15 clean 2021-04-28 16:00:13 +10:00
ryanzhao d0d4d9eb6f Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 2021-04-28 15:59:47 +10:00
ryanzhao 01eb7945f6 fix crash 2021-04-28 15:59:30 +10:00
jubb 9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 2021-04-28 14:46:50 +10:00