Commit Graph

6772 Commits

Author SHA1 Message Date
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
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
Niels Andriesse 43c484e35f Clean 2021-04-29 13:41:43 +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
Brice-W 54ba848d09 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 14:21:16 +10:00
nielsandriesse 97c74bb3dc Fix polling 2021-04-28 14:10:44 +10:00
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
2021-04-28 13:53:50 +10:00
Brice-W 8806fd0462 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 09:42:02 +10:00
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
2021-04-27 17:29:37 +10:00
Niels Andriesse 366276fe20
Merge pull request #503 from oxen-io/hardfork
Update for Hardfork Changes
2021-04-27 14:51:44 +10:00
Niels Andriesse a14fc0503f Take care of remaining loose ends 2021-04-27 14:48:57 +10:00
Niels Andriesse e2ad23482d Resolve various loose ends 2021-04-27 14:36:03 +10:00
Niels Andriesse 7150374c94 Clean 2021-04-27 14:26:26 +10:00
jubb 11aed5daff refactor: don't update profile if it is user's at all in visible message handling, leave it to config updates 2021-04-27 09:38:07 +10:00
jubb d3bd844d82 fix: re-import getLong and turn off optimize imports 2021-04-27 09:18:09 +10:00
Brice-W d4aaebd0a9 don't show zombie members in group remove updates 2021-04-26 16:33:54 +10:00
jubb 96cc867512 fix: BackgroundPollWorker.kt new instance instead of null instance 2021-04-26 15:55:13 +10:00
jubb 42ca1332ec fix: update prof pic and name and use new profile instead of existing recipient 2021-04-26 15:44:31 +10:00
Brice-W 6a32fabda5 revert change of commit 7c6475d9ee 2021-04-26 15:38:26 +10:00
jubb 572f262b6d fix: don't update the profiles if the values are empty 2021-04-26 15:18:12 +10:00
jubb 4bf0990ef9 feat: open group attachment and message processing 2021-04-26 14:30:51 +10:00
Brice-W f0394fb908 fix avatar display issues 2021-04-26 14:14:39 +10:00
Niels Andriesse 07fe672f31 Clean 2021-04-26 13:12:05 +10:00
Brice-W 7c6475d9ee EncryptionKeyPair: only set a public key for 1-1 message case 2021-04-26 11:51:11 +10:00
Niels Andriesse fdede1c656 Clean 2021-04-26 11:39:23 +10:00
Niels Andriesse 69f05dabdf Clean 2021-04-26 11:23:09 +10:00
Niels Andriesse 17e764fc31 Clean 2021-04-26 11:14:45 +10:00
Niels Andriesse 25307068e8 Match iOS protobuf 2021-04-26 11:06:00 +10:00
Niels Andriesse 676c307412 Clean 2021-04-26 10:58:48 +10:00
Niels Andriesse bc66c45bca Clean 2021-04-26 10:26:31 +10:00