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
Brice-W
a5e376b616
import of Signal's code to deal with attachments saving
2021-04-28 09:22:19 +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 7c6475d9ee5de4326a94caca909c241e8ab3aa7c
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
jubb
6272856ef9
feat: syncing / joining / leaving working on open group v2
2021-04-23 17:49:24 +10:00
Brice-W
15707b7060
fix encryption key pair handling
2021-04-23 16:35:24 +10:00
Niels Andriesse
7415c728eb
Merge branch 'hardfork' of github.com:oxen-io/session-android into hardfork
2021-04-23 16:11:31 +10:00
Niels Andriesse
979c21ccbf
Fix duplicated API
2021-04-23 16:09:47 +10:00
Brice-W
b064f8f5d7
implementation of the zombie members handling logic
2021-04-23 14:07:10 +10:00
Brice-W
3e4a6a9df4
Merge branch 'hardfork' of https://github.com/loki-project/session-android into closed-groups-update
2021-04-23 10:58:14 +10:00
jubb
a4d79ea2d3
feat: join groups logic
2021-04-22 17:26:40 +10:00
Ryan ZHAO
a9b38bd19c
hide the input panel when editing nicknames
2021-04-22 16:32:58 +10:00
Ryan ZHAO
8001f556b7
minor fix
2021-04-22 16:05:35 +10:00
Ryan ZHAO
162b597d4d
enable cancelling editing nickname with simple UI
2021-04-22 15:52:01 +10:00
Ryan ZHAO
b94597a1f6
make it possible to set a client-side nickname
2021-04-22 14:41:00 +10:00
Niels Andriesse
f21ad17dd5
Merge branch 'dev' into hardfork
2021-04-22 13:27:09 +10:00
Ryan ZHAO
d78dc83307
minor refactor on storing display names
2021-04-22 10:48:19 +10:00
Ryan ZHAO
951e6f6e0c
Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout
2021-04-22 09:16:43 +10:00
