Commit Graph

627 Commits

Author SHA1 Message Date
Niels Andriesse c580da5dd1 Fix crash 2021-05-20 13:35:43 +10:00
Niels Andriesse c7d865fb57 Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-05-20 12:06:41 +10:00
Niels Andriesse 15daf27efd Remove file server instability modal 2021-05-20 12:06:22 +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
nielsandriesse c861b330ba Add file server instability modal 2021-05-20 11:00:00 +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
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