654 Commits

Author SHA1 Message Date
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
jubb
ac198bd705 refactor: add in missing resource and removing broken folders preventing build 2021-05-18 14:05:45 +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
e598d73539
Merge pull request #516 from Brice-W/media-saving
Fix Saving Media Files
2021-05-17 15:47:18 +10:00
Niels Andriesse
2172152219
Merge pull request #538 from beantaco/japanese
More Japanese Translations
2021-05-17 15:23:45 +10:00
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +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
33e77dde1e Fix group deletion 2021-05-17 13:46:17 +10:00
Niels Andriesse
b248b5c52b Fix build 2021-05-17 13:37:12 +10:00
jubb
eee3824ca0 refactor: running the remove unused resources command and cleaning up strings 2021-05-17 11:56:14 +10:00
Niels Andriesse
11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
Niels Andriesse
9074355b4e Fix attachment pointer conversion 2021-05-17 11:23:49 +10:00
Niels Andriesse
361be28223 Fix group deletion 2021-05-17 10:49:27 +10:00
beantaco
4b225c1456
Add new Japanese translations 2021-05-14 10:26:47 +00:00
beantaco
d61b1c05f0
Fix some Japanese translations
- In message details, "Disappears" (meant as message lifetime) is translated to "寿命" (lifetime).
- Translation of "decentralized" is changed from "分散型" (distributed) to "非中央集中型".
- "Session ID を入力してください" (translation of "Enter Session ID" tab) is too long and was not expressed in command form. -> "Session ID を入力する"
- "パス" (the translation of "path") could be a translation of "pass" and its meaning is ambiguous, so is changed to "経路" (route).
- "お知らせ" (also a translation of "news" and "announcement") is changed to "通知" (notification), making translation of "notification" more consistent.
2021-05-14 10:26:41 +00:00
Niels Andriesse
3e75ed3cc4 Merge branch 'dev' into v2-file-server 2021-05-14 16:19:57 +10:00
Niels Andriesse
92acb50ea7
Merge pull request #537 from hjubb/image_sending_og_fixes
Open Group Image Sending Fixes
2021-05-14 15:58:24 +10:00
jubb
8b5134b9ef fix: fixes the failing insertions possibly composite PK related 2021-05-14 15:55:38 +10:00
Niels Andriesse
faa8c9443f Hardcode community guidelines 2021-05-14 15:17:16 +10:00
Niels Andriesse
6e5f75d472 Fix build 2021-05-14 13:53:41 +10:00
Niels Andriesse
9699126ac9 Update copy 2021-05-14 13:52:24 +10:00
Niels Andriesse
816e44a7ec Update copy 2021-05-14 13:52:05 +10:00
Niels Andriesse
72540aa787 Cancel jobs when thread is deleted 2021-05-14 13:51:47 +10:00
Niels Andriesse
446ff908ba Clean up RetrieveProfileAvatarJob 2021-05-14 13:51:35 +10:00
Niels Andriesse
43c5fce526 Make chips look better 2021-05-14 13:51:18 +10:00
Niels Andriesse
c9157d33c4 Update copy 2021-05-14 13:31:26 +10:00
Niels Andriesse
2b2756c5e7 Update copy 2021-05-14 13:30:52 +10:00
Niels Andriesse
5eed7a3cdd Clean 2021-05-14 13:13:02 +10:00
Niels Andriesse
ed9d1c7471 Cancel jobs when thread is deleted 2021-05-14 13:09:40 +10:00
Ryan ZHAO
c4cd74fca0 fix icons in bottom sheets don't follow the theme color 2021-05-14 11:04:28 +10:00
Niels Andriesse
88b4388e06 Clean up RetrieveProfileAvatarJob 2021-05-14 10:56:47 +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
Brice-W
8dd606cbb3 join open group code executed in a coroutine so it's not blocking the UI 2021-05-14 10:26:38 +10:00
Niels Andriesse
133bcac17c Make chips look better 2021-05-14 10:09:12 +10:00
Niels Andriesse
61c210837e Clean 2021-05-14 08:56:25 +10:00
Ryan ZHAO
1d5f7957ab clean 2021-05-13 16:20:55 +10:00
Niels Andriesse
a2c886468d Clean 2021-05-13 16:14:54 +10:00
Brice-W
b562aa5738 set notification text 2021-05-13 15:59:24 +10:00
Niels Andriesse
d9348c5442 Remove weird roundabout way of doing decryption 2021-05-13 15:27:08 +10:00
Brice-W
e1b8f10eec resend invitation if send has failed 2021-05-13 14:57:14 +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
22b4ca2a27 update home screen immediately 2021-05-13 14:25:09 +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
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
a0e186e8f6 fix keyboard showing/hiding issue 2021-05-13 10:25:11 +10:00
Ryan ZHAO
267a94b8ef minor fix 2021-05-13 10:24:32 +10:00
Niels Andriesse
43ba829977 Fix build 2021-05-13 09:40:07 +10:00
Niels Andriesse
3cab81c329 Fix message send job attachment upload handling 2021-05-13 09:38:39 +10:00
Niels Andriesse
979d176d4c
Merge branch 'dev' into background_job_improvements 2021-05-13 09:26:45 +10:00
Niels Andriesse
26601dbcb2 Clean up background poll worker 2021-05-13 09:24:13 +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
ryanzhao
d5a57c7dc8 minor refactor 2021-05-12 16:27:40 +10:00
nielsandriesse
bb850cf99e Minor job type refactoring 2021-05-12 16:17:25 +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
d8932416f1 Minor V2 open group refactoring 2021-05-12 14:48:13 +10:00
Brice-W
f51268b587 open group invitation sending part 2021-05-12 13:41:00 +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
2cac49b965 update profile picture url 2021-05-07 16:53:09 +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
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
Niels Andriesse
cc7e4701a3 Increment database version 2021-05-06 16:03:45 +10:00
Niels Andriesse
3c3f6c25f1 Fix various bugs 2021-05-06 15:46:22 +10:00
jubb
704723ed80 feat: add removing of the sent/received messages 2021-05-06 13:28:58 +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
ab64012b08 feat: remove requestLegacyExternalStorage 2021-05-04 11:40:21 +10:00
jubb
2eb612a967 feat: remove cleartext enabled 2021-05-04 09:08:21 +10:00
jubb
a2290a34fc feat: add polling in background 2021-05-03 17:58:11 +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
2999c138aa feat: add open group display name hex suffix 2021-05-03 11:29:04 +10:00
jubb
7e14a315b9 refactor: compact polling and usage based polling 2021-04-30 16:56:39 +10:00
Ryan ZHAO
51249d942d make the cancel button clean the nickname in database 2021-04-30 16:08:27 +10:00
Ryan ZHAO
9afa0d5886 fix the name won't update for the first message 2021-04-30 16:00:33 +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
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
Brice-W
6d29c5b8dc removing call to deprecated method getExternalStoragePublicDirectory 2021-04-29 16:27:34 +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
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
Brice-W
76c253ee77 Merge branch 'dev' of https://github.com/loki-project/session-android into media-saving 2021-04-29 13:53:50 +10:00
Niels Andriesse
43c484e35f Clean 2021-04-29 13:41:43 +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
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
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
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
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
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
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
d3bd844d82 fix: re-import getLong and turn off optimize imports 2021-04-27 09:18:09 +10:00
jubb
96cc867512 fix: BackgroundPollWorker.kt new instance instead of null instance 2021-04-26 15:55:13 +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
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
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
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
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
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