Commit Graph

83 Commits

Author SHA1 Message Date
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +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
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
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
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
Brice-W
2f0509a03b join open group from received invitation 2021-05-13 14:29:29 +10:00
Brice-W
f51268b587 open group invitation sending part 2021-05-12 13:41:00 +10:00
Brice-W
b2a924ebf8 views created + database storage 2021-05-12 08:40:10 +10:00
jubb
2eb612a967 feat: remove cleartext enabled 2021-05-04 09:08:21 +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
Niels Andriesse
43c484e35f Clean 2021-04-29 13:41:43 +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
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
jubb
1e164f8648 feat: adding default group handling to frontend viewmodel 2021-04-20 17:22:36 +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
2b7cf7c1b4 added Kind sealed class in UpdateMessageData + minor fixes 2021-04-16 15:54:39 +10:00
Brice-W
2a1dfff8c4 translations added 2021-04-15 16:33:40 +10:00
Brice-W
e57c697eca finishing data extraction handling 2021-04-09 16:06:12 +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
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
28cecc0236 expiration timer messages generation updated 2021-03-23 09:58:17 +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
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
Brice-W
471e028cf3 implementation of the receiving side of Data Extraction notifications & explicit group updates notifications 2021-03-16 14:56:47 +11:00
jubb
597ba3b0e2 fix: remove reference to non-existent SignalMapView 2021-03-10 09:43:35 +11:00
Niels Andriesse
fea79b819b
Merge pull request #468 from hjubb/sync_messages_update_contacts
Sync multi device fixes and link device implementation
2021-03-09 13:43:32 +11:00
jubb
0120eac350 fix: remove the dialog seed disclaimer 2021-03-05 10:28:35 +11:00
jubb
27958491c5 fix: specific empty thread snippet and removing the thread filtering for empty messages 2021-03-04 16:21:25 +11:00
beantaco
73bc4543f5
Fixes translations of "invalid"
Some instances of "invalid" were translated as "無効" (disabled/ineffective), for example "invalid protocol version" and "corrupted key". In these cases, "無効" has been replaced with "不正" (incorrect/improper).
2021-03-04 04:05:34 +00:00
beantaco
ad4721cf16
Fixes translation of "terms of use" 2021-03-04 04:05:31 +00:00
beantaco
52eaf6e5de
Makes translation of "Session" (software name) consistent
- "セッション" (where it refers to Session) -> "Session"
- Phrases that refer to secure sessions were left untouched.
2021-03-04 04:05:29 +00:00
beantaco
b0729f01a3
Makes translation of "device" consistent
- デバイス
- 端末  <- chosen

Though "デバイス" is now widely used, some Japanese people get confused by "デバイス" either having no idea what it means or thinking it's to do with accessory devices. "端末" has been widely used since the 20th Century and explicitly refers to "terminal" devices like computers and smartphones.

Incidental changes:

- Changes "切り離す" to "リンクを解除する" and similar phrases related to unlinking devices.
- Replaces "[...]" with "「...」"
2021-03-04 04:05:26 +00:00
beantaco
882cc2d8cb
Tweaks translation of "ask (the sender)"
"お願いする" can mean "ask" but is a humble form (謙譲語) of "願う", so is only used when oneself asks others to do something. Technically it cannot be used when prompting the Session user to ask the sender to do something. After a confirmation by quick internet search, I found "頼む" is a better fit.
2021-03-04 04:05:24 +00:00
beantaco
da802ebf8c
Makes translations of "update" consistent
- アプデート
- アップデート
- 更新  <- chosen
2021-03-04 04:05:21 +00:00
beantaco
edbf2f1648
Fixes the strings that specify valid display names 2021-03-04 04:05:19 +00:00
beantaco
f5b3dad025
Replaces "Signal" with "Session" in translation strings 2021-03-04 04:05:14 +00:00
beantaco
62d687c8f8
Improves translation of open groups and closed groups
- open group:   オープングループ -> 公開グループ
- closed group: 閉じたグループ -> 非公開グループ
2021-03-04 04:04:42 +00:00
jubb
ef3e172379 feat: add link device implementation and fixes for updating config syncs and forcing config syncs 2021-03-03 11:33:35 +11:00