jubb
573760769c
Merge remote-tracking branch 'upstream/dev' into fix_resources
...
# Conflicts:
# app/src/main/res/values-fr/strings.xml
# app/src/main/res/values-ja/strings.xml
2021-05-18 10:09:26 +10:00
Niels Andriesse
47ff53d559
Remove SignalServiceMessageReceiver
2021-05-18 09:54:16 +10:00
Niels Andriesse
c1548a4e51
Move files
2021-05-18 09:50:16 +10:00
Niels Andriesse
dc8938c269
Move protos
2021-05-18 09:44:06 +10:00
Niels Andriesse
c124f86f6b
Move protos
2021-05-18 09:36:20 +10:00
Niels Andriesse
961972a723
Move protos
2021-05-18 09:34:45 +10:00
Niels Andriesse
c9ebcc580f
Move files
2021-05-18 09:26:08 +10:00
Niels Andriesse
40d2fd25d9
Move files
2021-05-18 09:21:56 +10:00
Niels Andriesse
ce3b32c03e
Move files
2021-05-18 09:17:22 +10:00
Niels Andriesse
a88322a033
Move files
2021-05-18 09:12:33 +10:00
jubb
0f435ca040
refactor: remove more unnecessary strings from libsession's values
2021-05-17 17:29:39 +10:00
Niels Andriesse
6b3aa86324
Minor refactoring
2021-05-17 15:19:36 +10:00
Brice-W
e40609f6a8
clean
2021-05-17 14:19:37 +10:00
Brice-W
059a84f3ce
Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation
2021-05-17 14:18:09 +10:00
Brice-W
ff50d2f1fd
error handling if something goes wrong when creating a group
2021-05-17 14:16:04 +10:00
Niels Andriesse
cf3f0fbe57
Minor refactoring
2021-05-17 13:57:18 +10:00
Niels Andriesse
11e223f5d8
Merge branch 'dev' into open-group-invitations
2021-05-17 11:42:27 +10:00
Niels Andriesse
3e75ed3cc4
Merge branch 'dev' into v2-file-server
2021-05-14 16:19:57 +10:00
Niels Andriesse
9ab58c2f0c
Clean
2021-05-14 16:05:35 +10:00
jubb
8b5134b9ef
fix: fixes the failing insertions possibly composite PK related
2021-05-14 15:55:38 +10:00
Brice-W
91c3ec6c7d
Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation
2021-05-14 10:56:55 +10:00
Brice-W
f5a99b43c7
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
2021-05-14 10:32:12 +10:00
Niels Andriesse
61c210837e
Clean
2021-05-14 08:56:25 +10:00
Niels Andriesse
a2c886468d
Clean
2021-05-13 16:14:54 +10:00
Niels Andriesse
ea71d285b7
Clean
2021-05-13 15:42:14 +10:00
Niels Andriesse
d9348c5442
Remove weird roundabout way of doing decryption
2021-05-13 15:27:08 +10:00
Brice-W
2f0509a03b
join open group from received invitation
2021-05-13 14:29:29 +10:00
Ryan ZHAO
7b8a025947
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-13 14:25:19 +10:00
Ryan ZHAO
85eff702c3
clean
2021-05-13 14:24:30 +10:00
Niels Andriesse
d83c257491
Use V2 file server for profile pictures
...
Also don't randomly rotate profile key
2021-05-13 14:24:27 +10:00
Niels Andriesse
3e1727fdbc
Debug
2021-05-13 13:34:35 +10:00
Niels Andriesse
7c5b4aafec
Debug
2021-05-13 13:19:08 +10:00
Niels Andriesse
0faeb7becf
Update AttachmentUploadJob for the V2 file server
2021-05-13 11:11:42 +10:00
Niels Andriesse
75ce0f056c
Use snodes returned in 421 response
2021-05-13 10:42:53 +10:00
Niels Andriesse
b798f49512
Minor performance optimization
2021-05-13 10:38:13 +10:00
Niels Andriesse
288d76d292
Add documentation
2021-05-13 10:33:34 +10:00
Niels Andriesse
115bc9b159
Speed up path building
2021-05-13 10:31:06 +10:00
Ryan ZHAO
b5dbec836c
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-13 10:25:52 +10:00
Ryan ZHAO
267a94b8ef
minor fix
2021-05-13 10:24:32 +10:00
Niels Andriesse
3cab81c329
Fix message send job attachment upload handling
2021-05-13 09:38:39 +10:00
jubb
edc1454609
fix: unnamed open groups being processed by creating new threads after deletion
...
job db not marking successful/unsuccessful properly
handling send and receive better / in order
2021-05-12 16:48:18 +10:00
jubb
84fa3dfc86
Merge remote-tracking branch 'upstream/dev' into background_job_improvements
...
# Conflicts:
# libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt
# libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
# libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
2021-05-12 16:31:53 +10:00
ryanzhao
46a01010e1
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-12 16:31:11 +10:00
nielsandriesse
c5e0589751
Don't crash on unexpected deserialization error
2021-05-12 16:21:53 +10:00
nielsandriesse
bb850cf99e
Minor job type refactoring
2021-05-12 16:17:25 +10:00
nielsandriesse
f5238982c3
Add missing message padding
2021-05-12 15:47:17 +10:00
nielsandriesse
174bccb0b7
Fix missing signature validation
2021-05-12 15:28:14 +10:00
ryanzhao
1e3ff1e6a1
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-12 15:11:18 +10:00
ryanzhao
4c63b724ee
make editting nickname work
2021-05-12 15:11:09 +10:00
nielsandriesse
c8cf5ebfa0
Make custom error messages actually work
2021-05-12 14:52:24 +10:00
nielsandriesse
d8932416f1
Minor V2 open group refactoring
2021-05-12 14:48:13 +10:00
nielsandriesse
fa5edcefd5
Minor message type refactoring
2021-05-12 14:01:57 +10:00
Brice-W
f51268b587
open group invitation sending part
2021-05-12 13:41:00 +10:00
jubb
18818bf8da
refactor: re-add the node limit
2021-05-12 11:24:08 +10:00
jubb
9f09977160
refactor: remove registration required for job serialization and test logs, don't try to read class object if the message send class is not of expected type
2021-05-12 10:43:17 +10:00
Brice-W
2a436edbf8
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
2021-05-12 08:41:12 +10:00
Brice-W
b2a924ebf8
views created + database storage
2021-05-12 08:40:10 +10:00
Ryan ZHAO
b43000bdd0
WIP: enable contact with UI
2021-05-11 17:05:04 +10:00
jubb
8439d57115
refactor: let the periodic work run more frequently and never fail from excessive retries preventing from re-running.
...
remove resume pending jobs from ApplicationContext onCreate and handle in home activity's onCreate instead.
prevent some illegal argument exceptions from Random.kt by returning null if empty
2021-05-10 17:07:10 +10:00
Ryan ZHAO
be3b8a4b7e
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-07 16:31:54 +10:00
Ryan ZHAO
a16e67d1fd
add new contact database api
2021-05-07 16:31:46 +10:00
jubb
e7377d640f
fix: use AttachmentUploadJob instead of two download job keys in all types
2021-05-07 13:36:35 +10:00
jubb
d707433f28
docs: remove no long applicable docs
2021-05-07 12:03:04 +10:00
jubb
ccd9493f62
refactor: remove unlimited by array size and cap at 10_000_000
2021-05-07 12:02:12 +10:00
jubb
4fff5ac2dc
refactor: make storage reference jobId by string in deletion, don't persist jobs we are about to delete, delete jobs that fail to serialize from storage (probably from corrupt or moved data classes) in temporary message send jobs
2021-05-07 11:48:03 +10:00
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
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
89e0d9b0cf
WIP
2021-05-07 09:30:50 +10:00
Niels Andriesse
3c3f6c25f1
Fix various bugs
2021-05-06 15:46:22 +10:00
Brice-W
9399da6bad
handle the case when an added member is a zombie
2021-05-06 14:49:28 +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
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
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
c102c5132e
fix: don't use testnet
2021-05-04 09:06:59 +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
Brice-W
bb25877515
light refactor + OpenGroupUrlParser implementation & unit test
2021-05-03 14:15:39 +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
Brice-W
9ee167c173
handleOpenGroupInvitation skeleton added + region added
2021-04-30 16:09:11 +10:00
Brice-W
99a62d9e99
adding openGroupInvitation types in proto & class
2021-04-30 16:00:13 +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
ef19c0d10e
fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished
2021-04-29 17:13:42 +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
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
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
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
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
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
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
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
Brice-W
d4aaebd0a9
don't show zombie members in group remove updates
2021-04-26 16:33:54 +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
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
jubb
a4d79ea2d3
feat: join groups logic
2021-04-22 17:26:40 +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
jubb
f9939aae92
feat: handling default group requests and open group api updates for proper image endpoint handling
2021-04-21 17:00:57 +10:00
Niels Andriesse
9f26436041
Merge pull request #508 from Brice-W/data-extraction-2
...
Data extraction notifications
2021-04-21 13:44:46 +10:00
Brice-W
99fa7eb767
added specific UpdateMessageData.King types
2021-04-21 12:00:25 +10:00
jubb
1e164f8648
feat: adding default group handling to frontend viewmodel
2021-04-20 17:22:36 +10:00
Brice-W
7aa1f30c98
fix
2021-04-20 17:07:21 +10:00
Brice-W
3bfef2d0cd
e UpdateMessageBuilder to generate data extraction message
2021-04-20 16:55:46 +10:00
Brice-W
66e811ed75
Merge branch 'specific-group-updates' into data-extraction-2
2021-04-20 15:42:04 +10:00
jubb
aea23a6fc1
feat: finishing up OpenGroupAPIV2.kt calls
2021-04-19 10:16:38 +10:00
Brice-W
2b7cf7c1b4
added Kind sealed class in UpdateMessageData + minor fixes
2021-04-16 15:54:39 +10:00
Brice-W
c8f42d3b8e
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
2021-04-16 09:11:01 +10:00
jubb
96e604d06b
feat: more opengroup in chat manager, poller and API. refactor mentions to libsession
2021-04-15 17:17:55 +10:00
Brice-W
a346bb4ea5
clean
2021-04-15 15:44:42 +10:00
Brice-W
abb1db7a7e
new approach in update saving
2021-04-15 14:41:29 +10:00
Niels Andriesse
b7272bdf66
Increase TTL & remove PoW
2021-04-15 10:42:47 +10:00
Harris
6f46bbefbe
feat: add more opengroupv2 functions and classes
2021-04-14 23:25:38 +10:00
Brice-W
418363fdea
Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates
2021-04-14 16:37:57 +10:00
Brice-W
9cdcdc43a6
redesign of group update messages management
2021-04-14 16:37:04 +10:00
Harris
75b40a2b55
Merge remote-tracking branch 'upstream/dev' into open_groups_V2
2021-04-14 14:02:59 +10:00
Harris
d3ca54ce86
fix: address job.id properly in persistence
2021-04-14 12:26:34 +10:00
jubb
0eadc55325
feat: add open group v2 storage and db methods, starting on new open group v2 poller
2021-04-13 17:17:16 +10:00
Brice-W
df0ca11ec5
Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates
2021-04-12 14:26:13 +10:00
