Niels Andriesse
d79d236580
Implement authenticated message retrieval
2021-07-26 11:23:58 +10:00
Harris
285d5a6c22
Merge remote-tracking branch 'upstream/dev' into notification_control
2021-07-26 09:38:11 +10:00
Niels Andriesse
07f43121c3
Merge pull request #672 from hjubb/chat_ux_improvements
...
Fixes Open Group Quote Bug
2021-07-23 16:22:29 +10:00
Harris
3c6b1eff44
fix: open groups update the sent timestamp locally to be the returned group
2021-07-23 16:04:18 +10:00
Niels Andriesse
118447799a
Handle incorrect clock setting
2021-07-23 14:09:27 +10:00
Harris
b95cb2bedb
feat: add notification types for all / mentions only or none with UI and push logic
2021-07-20 16:06:59 +10:00
jubb
5f7278b9c4
refactor: OpenGroupPollerV2.kt no longer queues jobs and executes synchronously, BackgroundPollWorker.kt no longer replaces periodic tasks but keeps existing ones, removing unused references
2021-07-15 12:00:30 +10:00
Niels Andriesse
5b612806c5
Include destination info in error messages
2021-07-15 09:32:00 +10:00
jubb
6a2a04e256
feat: don't show notifications on HomeActivity.kt
2021-07-13 16:31:16 +10:00
Niels Andriesse
6b7c7d1d2a
Add support for new ban and delete all endpoint
2021-07-13 14:28:25 +10:00
Niels Andriesse
d1ee7d68bc
Don't retry message send jobs when rate limited
2021-07-13 09:56:14 +10:00
Niels Andriesse
1747e4a8ee
Don't use testnet
2021-07-12 14:35:22 +10:00
Niels Andriesse
5168e15640
Merge branch 'dev' into security
2021-07-12 14:27:14 +10:00
Niels Andriesse
462a7ed977
Merge pull request #647 from hjubb/trusted_attachment_download
...
Only Download Attachments from Trusted Contacts
2021-07-12 10:57:30 +10:00
Niels Andriesse
b2a067cba6
Re-use existing build paths promise if possible
2021-07-12 10:02:00 +10:00
jubb
842cfc25a1
Merge branch 'dev' into trusted_attachment_download
...
# Conflicts:
# app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
# app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
2021-07-12 09:28:14 +10:00
jubb
fa06a57ec3
fix: getting local user's ID if message is outgoing to check against that value in attachment download
2021-07-09 16:04:06 +10:00
jubb
1ee1d1795d
fix: only resume AttachmentDownloadJobs and fix boolean logic on returning early in download job
2021-07-09 15:17:07 +10:00
jubb
9dfd051e63
feat: trust dialog and processing attachments for users after trusting them
2021-07-09 15:13:43 +10:00
jubb
bc4f660fb0
fix: downloads now don't automatically queue for untrusted contacts and UI to handle re-downloading failed attachments
2021-07-08 17:14:53 +10:00
Niels Andriesse
666cab9df6
Clean up TextSecurePreferences
2021-07-08 16:31:37 +10:00
Niels Andriesse
0524d42f1a
Merge branch 'dev' into security
2021-07-08 10:50:25 +10:00
Niels Andriesse
d447c5c307
Merge pull request #637 from hjubb/fix_voice_update_crash
...
Fix Voice Message Behavior
2021-07-07 15:37:29 +10:00
Niels Andriesse
30b4a7ecc8
Merge pull request #613 from Brice-W/exp-timer-config-message
...
Add Closed Group Expiration Timer Setting to Configuration Message
2021-07-07 15:11:21 +10:00
Harris
683b5243bd
fix: notify update for attachment's thread ID on setting audio extras
2021-07-07 14:56:53 +10:00
Niels Andriesse
09502ee9ab
Remove unused resources
2021-07-07 14:00:18 +10:00
jubb
8cc2f78da7
fix: audio durations set accordingly for send and receive and doesn't break saving / uploading by exhausting the input stream
2021-07-06 16:53:44 +10:00
jubb
f4e5e5e36a
fix: duplicate message send bug on attachments
2021-07-05 15:00:32 +10:00
jubb
f7bec07503
fix: raise output max buffer size to Job.MAX_BUFFER_SIZE
2021-07-05 10:46:48 +10:00
jubb
d57903aa44
fix: open group poller queues trim thread job only if received messages
...
deleting quotes should now propagate to set quote missing flag in MMS and update the UI accordingly
2021-07-05 09:59:54 +10:00
jubb
50b02323a8
fix: failing to serialize from AttachmentUploadJob.kt started from resumed pending jobs
2021-07-05 09:53:12 +10:00
jubb
b329402faf
fix: audio waveforms decoded on the attachment download
2021-07-01 17:06:42 +10:00
jubb
9566120d66
fix: revert max failure count on upload and send jobs
2021-07-01 13:45:14 +10:00
jubb
8701f68292
fix: prevent crash in audio view
2021-07-01 13:43:48 +10:00
jubb
d98f34fa73
fix: only show loader if the message isn't failed, fix attachment upload and message send pending states in the conversation
2021-07-01 11:39:18 +10:00
jubb
ab876ca9b8
fix: MessageSendJob.kt sets message as sending before calling send so conversation adapter doesn't display as error / let users retry while send job is pending
2021-07-01 11:20:31 +10:00
jubb
758475f0dc
fix: R.color.destructive on the error drawable in conversation and home adapter and handling message re-sending
2021-07-01 11:06:11 +10:00
Niels Andriesse
7b7a9961da
Merge pull request #620 from hjubb/ui
...
Fix 421s, Fix NotifyPNServerJob Crash & Fix URL Handling
2021-06-29 16:13:36 +10:00
Niels Andriesse
f1745448bb
Hook up link preview suggestion dialog
2021-06-29 15:48:40 +10:00
jubb
8b4b264992
fix: 421 errors not being handled properly by sendOnionRequest and prevent retrying with stale swarm data, no longer crash with large NotifyPNServerJob.kt payload in Kryo deserialization
2021-06-29 15:12:33 +10:00
Niels Andriesse
8f2f1a47fd
Merge branch 'ui' into ui
2021-06-29 13:37:11 +10:00
Niels Andriesse
9f4571b0c1
Implement remaining menu actions
2021-06-29 13:26:33 +10:00
jubb
09f4cfb1ad
feat: add back overflow text, increase AttachmentDownloadJob.kt max failure count, resize overflow text size, remove unused animator update listener implementation in ThumbnailProgressBar.kt
2021-06-29 11:22:59 +10:00
Niels Andriesse
18e345733e
Implement a few basic contextual actions
2021-06-28 16:28:00 +10:00
jubb
1df6fa46a4
feat: clear all data dialog with local and network only options
2021-06-22 17:01:27 +10:00
jubb
05b0e5f308
feat: handling responses and using new updated params
2021-06-21 15:48:42 +10:00
Brice-W
362589f83f
refactor
2021-06-21 14:06:48 +10:00
Brice-W
bb7dc318c7
delete obsolete code
2021-06-21 14:04:00 +10:00
Brice-W
a71273e813
refactor
2021-06-21 14:03:08 +10:00
Brice-W
35d5def515
adding expiration timer to configuration message
2021-06-18 16:44:58 +10:00
jubb
fdc042e6d4
feat: testnet clearing network data on delete and differentiating dialogs
2021-06-18 16:01:34 +10:00
Niels Andriesse
123cd6d486
Handle text only quote drafts
2021-06-18 15:54:24 +10:00
Harris
11f64a1d1a
feat: add snode method delete_all with data class for params, refactoring ClearAllDataDialog.kt to handle async requests better and prevent ANR
2021-06-17 18:29:05 +10:00
Niels Andriesse
2188200717
Merge branch 'dev' into ui
2021-06-16 10:19:52 +10:00
Niels Andriesse
71ffaaabc2
Add documentation
2021-06-16 10:19:42 +10:00
Brice-W
1b6ab36a03
fix
2021-06-15 16:47:35 +10:00
Brice-W
7b22d14a2c
using different timestamp for NEW group updates
2021-06-15 16:16:03 +10:00
Brice-W
47c989ab2e
Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update
2021-06-15 11:21:55 +10:00
Niels Andriesse
ed6db6f4e7
Merge branch 'dev' into ui
2021-06-11 13:41:50 +10:00
Niels Andriesse
f4ae16239e
Clean
2021-06-11 11:27:15 +10:00
Brice-W
b8efe73a3b
update formation timestamp when group is rejoined after being left
2021-06-10 17:34:48 +10:00
Brice-W
3b03aef80f
handle expiration timer with NEW group update type
2021-06-09 14:31:05 +10:00
Harris
51061cac0e
Merge remote-tracking branch 'upstream/dev' into identity_key_encryption
2021-06-08 11:53:38 +10:00
Brice-W
14d401b27a
fix
2021-06-07 14:46:54 +10:00
Harris
91aefb7c87
feat: upgrade to keystore sealed identity key preferences
2021-06-07 11:53:17 +10:00
nielsandriesse
d465fecf4c
Populate conversation menu
2021-06-07 09:48:01 +10:00
nielsandriesse
3bf5a50439
Fix readability issues & simplify code
2021-06-04 16:32:19 +10:00
Brice-W
1d0b61cf89
fix to avoid zombies to be cleared when new group update received
2021-06-04 12:20:21 +10:00
Brice-W
6fb461f7d8
reset zombie members list if group already exists
2021-06-04 11:24:01 +10:00
Brice-W
1a117b0189
Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update
2021-06-03 11:51:57 +10:00
nielsandriesse
dfd9bd89f9
Fix colors
2021-06-02 13:03:22 +10:00
nielsandriesse
d8ba01cf5d
Clean up join open group screen
2021-06-02 10:51:36 +10:00
nielsandriesse
15d864cd2a
Update documentation
2021-06-02 09:38:22 +10:00
Harris
2bdb4d18a2
fix: property name for json deserialisation
2021-05-31 14:24:43 +10:00
nielsandriesse
e1f3362c2a
Fix crash
2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be
Prepare for OGS timestamp handling changes
2021-05-31 11:23:37 +10:00
ryanzhao
e8c52961aa
minor fix
2021-05-28 15:14:05 +10:00
ryanzhao
4f7d26d86e
debug for new encryption
2021-05-28 12:04:37 +10:00
ryanzhao
a81c17057f
Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1
2021-05-28 11:22:58 +10:00
ryanzhao
497405fe50
clean
2021-05-28 11:22:46 +10:00
ryanzhao
c0d4dd741c
debug
2021-05-28 11:22:06 +10:00
nielsandriesse
e16322977b
Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev
2021-05-28 11:01:41 +10:00
nielsandriesse
c6976ca3cd
Fix naming confusion
2021-05-28 11:00:49 +10:00
Harris
4a8ce784b8
fix: no longer using the wrong deletion IDs for open group deletions
2021-05-28 10:50:07 +10:00
Ryan ZHAO
a66d2c97e0
Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1
2021-05-27 16:52:12 +10:00
Ryan ZHAO
592825dcc6
implement get session id from ons name api
2021-05-27 16:23:15 +10:00
Niels Andriesse
2441d86b32
Make member ordering consistent
2021-05-27 16:07:54 +10:00
jubb
72569327a9
Merge remote-tracking branch 'upstream/dev' into improve_background_jobs
2021-05-27 15:45:07 +10:00
Ryan ZHAO
0e89d88459
Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1
2021-05-27 15:32:00 +10:00
Niels Andriesse
85120b57ea
Batch conversation updates
2021-05-27 15:05:15 +10:00
ryanzhao
ae23266058
wip: implement ons name
2021-05-26 16:34:08 +10:00
jubb
efa36d4cea
refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message
...
migrate TrimThreadJob.kt to new job system
deleting more open group references in removal
open group last message / last deletion now sets after processing vs after fetching
2021-05-26 15:22:19 +10:00
Brice-W
365ccda113
Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update
2021-05-25 16:15:51 +10:00
Brice-W
5eaef76b02
don't update zombie members if current user is removed
2021-05-25 15:45:43 +10:00
Niels Andriesse
abf2c05424
Debug closed group creation issue
2021-05-25 10:56:29 +10:00
Niels Andriesse
5d9957a57d
Fix merge
2021-05-24 16:21:24 +10:00
Niels Andriesse
ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
...
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse
550d8b61c7
Quick fix crash
2021-05-24 15:31:46 +10:00
ryanzhao
25df4330be
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
2021-05-24 14:49:56 +10:00
Niels Andriesse
c058b332da
Fix typo
2021-05-24 14:14:09 +10:00
Niels Andriesse
639146cc0a
Simplify & fix from_server_id
usage
2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac
Merge branch 'dev' into polling-limit
2021-05-24 13:37:13 +10:00
Niels Andriesse
90dca7149a
Remove redundant this
2021-05-24 13:32:16 +10:00
Brice-W
6c37e7a93f
move logic from Storage to OpenGroupAPIV2
2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96
Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity
2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278
Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity
2021-05-24 12:58:35 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames
...
Nicknames
2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda
Fix open group display name handling
2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a
implementation of polling limit on open groups
2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8
Add contacts migration
2021-05-24 11:35:05 +10:00
Niels Andriesse
e7ae08fe7a
Clean
2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
2021-05-24 09:19:56 +10:00
Niels Andriesse
66e7df22bb
Don't notify for closed group control messages
...
This addresses an issue where:
• someone would create a closed group
• on other peoples' devices this control message would be received through a background poll or a push notification
• the received message timestamps table would be updated
• processing wouldn't be finished (during a background poll or while handling a push notification the system can cut you off at any time)
• some of the added users don't see the new closed group because when they open the app and get the control message from their swarm it's considered a duplicate and isn't processed again
2021-05-24 08:53:27 +10:00
Niels Andriesse
dfd3ccc5d2
Clean
2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2
Clean
2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4
Merge branch 'dev' into nicknames
2021-05-21 15:21:24 +10:00
Niels Andriesse
a4a11e8e5e
Fix indentation
2021-05-21 15:09:50 +10:00
Niels Andriesse
49c3ffd9ca
Remove redundant code
2021-05-21 15:02:34 +10:00
Ryan ZHAO
953f6d8c17
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
2021-05-21 14:55:15 +10:00
Ryan ZHAO
d52787a661
try to use jobs to mark if all open groups are caught up
2021-05-21 14:55:06 +10:00
Niels Andriesse
910787a960
Fix polling bug
2021-05-21 13:12:34 +10:00
Niels Andriesse
ff96bb05a8
Implement remaining bits and pieces
2021-05-21 11:09:03 +10:00
Niels Andriesse
da331b036e
Integrate new closed group poller
2021-05-21 10:30:02 +10:00
Niels Andriesse
a3a62b6dbb
Implement ClosedGroupPollerV2
2021-05-21 10:24:48 +10:00
Niels Andriesse
2a756375a8
Merge branch 'dev' into variable-rate-polling
2021-05-21 10:07:41 +10:00
Niels Andriesse
12ae8d4051
Debug
2021-05-21 09:26:25 +10:00
Niels Andriesse
8e836aa175
Fix build
2021-05-21 09:16:24 +10:00
Niels Andriesse
e42b884b13
Upgrade Kryo
2021-05-21 09:05:55 +10:00
Niels Andriesse
b0f564672b
Update build number
2021-05-21 09:04:32 +10:00
Brice-W
1cdbad5eaa
Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update
2021-05-20 16:16:35 +10:00
Niels Andriesse
dd92484b4e
Create ClosedGroupPollerV2
2021-05-20 16:15:20 +10:00
Ryan ZHAO
563a13d208
fix nickname usage & clean
2021-05-20 14:06:42 +10:00
Ryan ZHAO
ca723a3796
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-20 12:01:22 +10:00
Ryan ZHAO
30c7a4c1bb
fix nickname in group creating & editing
2021-05-20 12:01:08 +10:00
Niels Andriesse
039b667f59
Merge pull request #546 from hjubb/fix_missing_deps
...
Use Maven Central Instead of Bintray
2021-05-20 11:53:08 +10:00
Ryan ZHAO
38ed5c2187
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-20 11:15:24 +10:00
Niels Andriesse
7e10910862
Switch to dedicated server
2021-05-20 10:58:52 +10:00
nielsandriesse
747a27ddda
Add file server instability modal
2021-05-19 15:25:36 +10:00
Harris
99e6382f2e
refactor: use lazysodium version on maven central instead of bintray (no longer available)
2021-05-19 15:12:35 +10:00
Niels Andriesse
984add5d09
Merge pull request #544 from hjubb/fix_resources
...
Remove Unused Resources + Updating Translations
2021-05-19 11:28:20 +10:00
Harris
84e8418d57
Merge remote-tracking branch 'upstream/dev' into origin/fix_resources
2021-05-19 10:57:47 +10:00
nielsandriesse
eee9d6688e
Debug
2021-05-19 10:31:08 +10:00
nielsandriesse
4d44bed67d
Improve performance
2021-05-19 10:07:09 +10:00
nielsandriesse
fda66d3f5d
Refactor V2 open group poller
2021-05-19 10:03:31 +10:00
nielsandriesse
80c90fa53d
Remove incorrectly maintained & unused value
2021-05-19 09:03:49 +10:00
nielsandriesse
2a3d06e485
Fix duplicate message handling
2021-05-19 08:56:44 +10:00
Niels Andriesse
7d241eab6c
Add uncommitted file
2021-05-18 16:15:27 +10:00
Niels Andriesse
6243443262
Move files
2021-05-18 16:11:38 +10:00
Niels Andriesse
4078a9c4b5
Move files
2021-05-18 16:03:47 +10:00
Niels Andriesse
ab83e49f93
Remove duplicated/unused code
2021-05-18 15:55:24 +10:00
Niels Andriesse
918e1ea3cf
Merge pull request #542 from Brice-W/error-handling-group-creation
...
Improved Group Creation Error Handling
2021-05-18 15:05:32 +10:00
Niels Andriesse
7208bb0421
Fix build
2021-05-18 15:03:17 +10:00
Niels Andriesse
68225e00be
Clean
2021-05-18 14:45:37 +10:00
Niels Andriesse
8a20c46bd4
Fix missing compile target
2021-05-18 14:08:21 +10:00
Niels Andriesse
81b0530163
Clean up libsession Gradle file
2021-05-18 13:27:51 +10:00
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
Brice-W
40015c2898
clean
2021-04-09 16:36:18 +10:00
Brice-W
db415f371a
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
2021-04-09 16:30:36 +10:00
Niels Andriesse
201dde7412
Merge pull request #494 from hjubb/refactor-sending
...
Fix expiration timers updates for groups
2021-04-09 16:22:40 +10:00
Brice-W
ec42cc79a5
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
2021-04-09 16:07:47 +10:00
Brice-W
e57c697eca
finishing data extraction handling
2021-04-09 16:06:12 +10:00
jubb
f723069775
fix: check actual collisions instead of not
2021-04-09 14:19:48 +10:00
Brice-W
fce1d60d7d
clean
2021-04-08 15:40:00 +10:00
Brice-W
30b47a32cb
Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates
2021-04-08 15:21:46 +10:00
Brice-W
cc24e29cb2
clean
2021-04-08 15:11:46 +10:00
Brice-W
d027d0c640
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
2021-04-08 15:00:31 +10:00
Brice-W
dd3d962dea
fix expiration timers updates for groups
2021-04-08 12:07:23 +10:00
Niels Andriesse
8400c7606b
Merge pull request #493 from hjubb/pin_seed_certs
...
Introduce service node seed certificates
2021-04-07 15:12:13 +10:00
jubb
b149886068
feat: add certificate pem files, set up network security config and point seed pools to port accordingly
2021-04-07 14:49:52 +10:00
Brice-W
04f295ac6c
expiration timer updates handled as outgoing messages for multi device
2021-04-07 10:40:45 +10:00
jubb
7ba4e7a2d2
Merge branch 'refactor-sending' of github.com:hjubb/session-android into origin/refactor-sending
2021-04-06 17:13:12 +10:00
jubb
3b2589b835
refactor: use a shared timer in JobQueue.kt
2021-04-06 17:09:21 +10:00
Brice-W
9ca6986b71
fix sync of expiration timer update messages between linked devices
2021-04-06 16:05:59 +10:00
jubb
924f58f816
fix: don't update user profile name if message handling open group
2021-04-01 16:39:37 +11:00
jubb
20558a1e92
Merge branch 'refactor-sending' of github.com:hjubb/session-android into origin/refactor-sending
2021-04-01 16:27:11 +11:00
jubb
7d9f5bc46d
fix: replicate the same display name logic as settings activity
2021-04-01 16:25:01 +11:00
jubb
68506ffcfa
fix: don't store display name if current user's key
2021-04-01 16:17:32 +11:00
Brice-W
fe47a6e958
manage duplicates outgoing messages
2021-04-01 15:48:35 +11:00
Brice-W
5c87cef26a
fix multi device disappearing message issue
2021-03-31 17:14:51 +11:00
jubb
7121aa85fb
refactor: use OpenGroupAPI.kt instead of PublicChatAPI.kt for all open group operations.
...
Syncing open group notify conversation list listeners debounced so UI doesn't freeze on initial syncs
2021-03-31 15:15:50 +11:00
jubb
b6769ffddc
refactor: convert runnables to method references, schedule download of display names after parsing messages
2021-03-31 10:54:37 +11:00
jubb
a445e0a326
fix: moderator status going off open chat API instead of PublicChatAPI
2021-03-30 17:13:25 +11:00
jubb
65fbd56b6a
Merge branch 'refactor-sending' of github.com:hjubb/session-android into origin/refactor-sending
2021-03-30 16:24:55 +11:00
jubb
3654d1731c
fix: various fixes wrt open groups, config messages, job queueing
2021-03-30 16:23:12 +11:00
Brice-W
0292e70246
fix quote attachment issue
2021-03-30 13:09:40 +11:00
jubb
c3f7425ccd
fix: empty messages in open groups now correct properly
2021-03-29 16:40:56 +11:00
jubb
d292c760c4
Merge branch 'refactor-sending' of github.com:hjubb/session-android into origin/refactor-sending
2021-03-29 14:16:58 +11:00
jubb
db553544ec
fix: open group fixes for new message receive pipeline
2021-03-29 14:16:49 +11:00
Brice-W
8bc6df5d16
fix multi device attachment issue
2021-03-29 13:52:36 +11:00
Brice-W
d7c03c9d0a
group updates fixes
2021-03-26 15:46:37 +11:00
jubb
196a0205ae
refactor: revert expiry to be recipient based instead of message based
2021-03-25 15:12:55 +11:00
Brice-W
ef3bef787d
expiration timer handling updated
2021-03-25 14:55:23 +11:00
jubb
bdc086cacf
fix: use message's expiry instead of the recipient's
2021-03-25 14:11:58 +11:00
jubb
53c966b634
fix: race in receive messages processing from restore
2021-03-25 13:25:07 +11:00
jubb
611b272493
fix: attachments for quotes no longer doubled up
2021-03-24 17:17:01 +11:00
jubb
fad8cd5ba6
fix: changing the way received timestamp handling happens
2021-03-23 15:56:15 +11:00
jubb
1c1ce1424b
fix: replace elvis on optional proto object with protobuf has flag check
2021-03-23 11:39:14 +11:00
jubb
7f5f1e4559
Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending
...
# Conflicts:
# app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
2021-03-23 11:13:00 +11:00
Brice-W
5f297835fa
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
2021-03-23 10:57:13 +11:00
Brice-W
0bea7fa56d
clean
2021-03-23 10:43:32 +11:00
Brice-W
8c7f23a4e3
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction
2021-03-23 10:42:30 +11:00