863 Commits

Author SHA1 Message Date
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
baa8538f0e Update version number 2021-05-20 11:00:08 +10:00
nielsandriesse
c861b330ba Add file server instability modal 2021-05-20 11:00:00 +10:00
Ryan ZHAO
8f925a5b52 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-20 09:37:16 +10:00
Niels Andriesse
6ac534482f Update version number 2021-05-20 09:04:55 +10:00
ryanzhao
f13b5ab9d7 fix open group spam 2021-05-19 17:01:53 +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
nielsandriesse
e79d23c910 Add "Help us Translate Session" button 2021-05-19 13:47:04 +10:00
nielsandriesse
588f9ed8cd Remove entirely untranslated languages 2021-05-19 13:27:08 +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
nielsandriesse
7ba116c1df Switch to new open group manager 2021-05-19 11:12:29 +10:00
Harris
84e8418d57 Merge remote-tracking branch 'upstream/dev' into origin/fix_resources 2021-05-19 10:57:47 +10:00
nielsandriesse
f8ed7690ca Refactor OpenGroupManager 2021-05-19 10:56:23 +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
jubb
3acbbc1229 refactor: add latest translations (and repeats) 2021-05-18 16:43:45 +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
68225e00be Clean 2021-05-18 14:45:37 +10:00
Niels Andriesse
7c3bee036c Speed up Gradle sync 2021-05-18 14:18:16 +10:00
Niels Andriesse
8a20c46bd4 Fix missing compile target 2021-05-18 14:08:21 +10:00
jubb
ac198bd705 refactor: add in missing resource and removing broken folders preventing build 2021-05-18 14:05:45 +10:00
Niels Andriesse
cd1171ba84 Clean up app Gradle file 2021-05-18 13:34:40 +10:00
Niels Andriesse
81b0530163 Clean up libsession Gradle file 2021-05-18 13:27:51 +10:00
Niels Andriesse
b0e54d7e9f Update build number 2021-05-18 10:28:30 +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
77f0a54aec Update version number 2021-05-17 15:49:44 +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
3cb2d6c9f4 Update version number 2021-05-14 15:54:07 +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
c82a76b912 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-14 11:04:36 +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
54b93e56a0 Update version number 2021-05-14 08:58:11 +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
af84b1ef3a Update build number 2021-05-13 09:45:29 +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
nielsandriesse
21698fcba5 Update version number 2021-05-12 14:02:07 +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
Niels Andriesse
11a89c0a76 Update version number 2021-05-07 16:30:52 +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
Niels Andriesse
bfa75a3db9
Merge pull request #524 from hjubb/file_server_v2
New File Server V2 URL handling and open group v2 fixes / features
2021-05-06 14:03:31 +10:00
jubb
704723ed80 feat: add removing of the sent/received messages 2021-05-06 13:28:58 +10:00
Niels Andriesse
54d64192fb Update version number 2021-05-06 13:20:50 +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
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
Brice-W
0653b2c2d3 only admin can delete members 2021-04-21 16:34:22 +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
d1e276bf08 disable data extraction notification sending 2021-04-21 13:43:29 +10:00
Niels Andriesse
72f9bb8f4b
Merge pull request #506 from Brice-W/group-creation-ui
Improvement to the Group creation UI
2021-04-21 12:47:58 +10:00
Brice-W
99fa7eb767 added specific UpdateMessageData.King types 2021-04-21 12:00:25 +10:00
jubb
c601098065 feat: updating android deps 2021-04-20 17:23:02 +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
Ryan ZHAO
1e40c861d1 make screenlock work within 60s 2021-04-20 17:02:14 +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
Brice-W
f9de34f947 comment 2021-04-20 09:45:29 +10:00
Brice-W
10554011f8 avoid displaying self in the contacts list 2021-04-20 09:39:51 +10:00
Brice-W
be2692fec6 clean 2021-04-19 13:37:34 +10:00
Brice-W
b92f2e7904 clean 2021-04-19 13:36:42 +10:00
Brice-W
cba4e65b9e update with payload logic 2021-04-19 13:35:09 +10:00
Brice-W
3c210ca437 optimization on contacts selection 2021-04-19 10:46:19 +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
2a1dfff8c4 translations added 2021-04-15 16:33:40 +10:00
Brice-W
abb1db7a7e new approach in update saving 2021-04-15 14:41:29 +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
1b9f00ae62 Merge remote-tracking branch 'origin/dev' into open_groups_V2 2021-04-14 11:34:50 +10:00
nielsandriesse
5bcac3b39c Update version number 2021-04-14 10:51:21 +10:00
nielsandriesse
2d42d22df4 Don't close cursor prematurely 2021-04-14 10:49:19 +10:00
nielsandriesse
d1f00b6d77 Don't run local backup jobs for now 2021-04-14 10:04:25 +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
2bce2738b3 media saved notification is sent only when incoming media are saved 2021-04-12 12:02:41 +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
11f8c72fa5 refactor: remove old jobs and refactor any remaining calls to use new jobs 2021-04-08 16:12:54 +10:00
Brice-W
c03b49eeb7 clean 2021-04-08 15:48:00 +10:00
Brice-W
fce1d60d7d clean 2021-04-08 15:40:00 +10:00
Brice-W
8df7d2bb49 clean 2021-04-08 15:27:25 +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
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
nielsandriesse
5debd8f739 Update version number 2021-04-07 15:14:59 +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
Brice-W
9ca6986b71 fix sync of expiration timer update messages between linked devices 2021-04-06 16:05:59 +10:00
Brice-W
fe47a6e958 manage duplicates outgoing messages 2021-04-01 15:48:35 +11:00
jubb
20b5da18fe feat: lower debounce period 2021-04-01 11:51:39 +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
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
e3e45292a8 fix: unclosed cursor error message 2021-03-25 16:40:15 +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
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
a60ec8aaef fix: fix compile error 2021-03-23 11:15:25 +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
jubb
de0f9a26df refactor: remove old pollers from BackgroundPollWorker.kt and deleted unused pollers 2021-03-23 11:12:37 +11:00
Brice-W
1b01d0afd4 clean 2021-03-23 11:03:09 +11:00
Brice-W
68a3c73ab1 clean 2021-03-23 10:59:03 +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
8c7f23a4e3 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction 2021-03-23 10:42:30 +11:00
jubb
6f2bad9b59 fix: no duplicate group left messages, more efficient closed group polling 2021-03-23 10:00:51 +11:00
Brice-W
28cecc0236 expiration timer messages generation updated 2021-03-23 09:58:17 +11:00
Brice-W
24b4fb0665 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2 2021-03-22 15:18:14 +11:00
Brice-W
0578195d61 Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-03-22 15:12:09 +11:00
jubb
8ee58459dd feat: use new closed and open group pollers 2021-03-19 17:08:31 +11:00
Brice-W
a47113f2c5 revert changes 2021-03-19 16:57:00 +11:00
Brice-W
5dcb3d77d4 revert changes regarding explicit group updates as it's now in a separate PR 2021-03-19 16:39:41 +11:00
Brice-W
ddede475b4 Start of Update messages builder class implementation & usage for Input group updates 2021-03-19 16:25:00 +11:00
jubb
2460afd1a8 feat: call resume message send on app create 2021-03-18 13:36:56 +11:00
jubb
203c0dd44c refactor: fix imports / compile issues from merging dev 2021-03-18 09:52:20 +11:00
jubb
b685846d7e Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
#	libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt
2021-03-18 09:26:13 +11:00
Ryan ZHAO
80382cc454 minor refactor 2021-03-17 16:09:01 +11:00
Brice-W
2ca8b1acb1 missed case for sending media saved notification 2021-03-17 15:08:09 +11:00
Brice-W
9d82b4b7a9 sending media saved notification 2021-03-17 14:26:29 +11:00
Ryan ZHAO
1e9e580a2f minor refactor 2021-03-17 12:06:44 +11:00
Ryan ZHAO
436598a80b resume pending jobs on app starting 2021-03-17 11:30:03 +11:00
Ryan ZHAO
778a0d083f Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor-sending-error-handling 2021-03-16 16:31:58 +11:00
Ryan ZHAO
95646ed04e make error description show in the message detail activity 2021-03-16 16:31:52 +11:00
Brice-W
471e028cf3 implementation of the receiving side of Data Extraction notifications & explicit group updates notifications 2021-03-16 14:56:47 +11:00
Niels Andriesse
55eb963d10 Update build number 2021-03-16 13:24:40 +11:00
jubb
f307d7bb17 fix: add org.session and remove minify to release build 2021-03-16 11:45:02 +11:00
Niels Andriesse
2e65077b3a Update build number 2021-03-16 08:58:59 +11:00
jubb
fe3f3d5f88 refactor: remove redundant Companion qualifier 2021-03-15 16:44:44 +11:00
Ryan ZHAO
424aee5fb3 fix possible serialising crash & refactor 2021-03-15 15:43:05 +11:00
jubb
6508873e57 fix: fix the sent / receive timestamps for linking quotes 2021-03-15 15:03:23 +11:00
Ryan ZHAO
d2843b2cef fix removing jobs in database 2021-03-15 14:56:46 +11:00
jubb
817c40b30c refactor: inserting attachments with the messages so that they are linked properly to a mmsID 2021-03-15 13:35:05 +11:00
Niels Andriesse
293b01e857 Update version number 2021-03-15 09:28:12 +11:00
Niels Andriesse
f5e002ece1
Merge pull request #469 from RyanRory/refactor-sending
The Refactor: Message Sending Pipeline
2021-03-15 09:26:49 +11:00
jubb
323fb75149 fix: adding some message receive functionality 2021-03-12 17:15:33 +11:00
Ryan ZHAO
54da77a89b clean 2021-03-12 15:23:29 +11:00
Ryan ZHAO
d7e525d828 clean 2021-03-12 14:52:59 +11:00
Ryan ZHAO
6659b7a53e clean 2021-03-12 14:23:34 +11:00
Ryan ZHAO
91f9138d62 clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
Ryan ZHAO
60f51af295 clean & fix expiration timer setting issue 2021-03-12 11:27:51 +11:00
Ryan ZHAO
e85bf7a45d fix replying from push notification 2021-03-11 15:56:40 +11:00
Ryan ZHAO
2859da01a7 fix duplicated closed group info message 2021-03-11 15:31:14 +11:00