Brice-W
|
d98cef3c77
|
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
|
2021-05-07 09:34:24 +10:00 |
|
|
Brice-W
|
9399da6bad
|
handle the case when an added member is a zombie
|
2021-05-06 14:49:28 +10:00 |
|
jubb
|
e8bac5005e
|
feat: file server v2 and syncing open groups v2 in config messages
|
2021-05-05 17:29:27 +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 |
|
|
jubb
|
7e14a315b9
|
refactor: compact polling and usage based polling
|
2021-04-30 16:56:39 +10:00 |
|
|
Brice-W
|
9ee167c173
|
handleOpenGroupInvitation skeleton added + region added
|
2021-04-30 16:09:11 +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
|
496e833333
|
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
|
2021-04-29 13:29:12 +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 |
|
|
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 |
|
|
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 |
|
Niels Andriesse
|
69f05dabdf
|
Clean
|
2021-04-26 11:23:09 +10:00 |
|