6450 Commits

Author SHA1 Message Date
Ryan ZHAO
e90ffe8af8 Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor-sending 2021-03-05 09:54:08 +11:00
Ryan ZHAO
d84b593da2 fix expiration timer animation 2021-03-05 09:53:58 +11:00
Niels Andriesse
527683e111
Merge pull request #470 from beantaco/japanese
Initial fixes to Japanese translations
2021-03-05 09:23:15 +11:00
Ryan ZHAO
e0ff5a7e7a fix sending expiration update message 2021-03-04 17:14:12 +11:00
Ryan ZHAO
aa7071ad80 send typing indicator using new pipeline 2021-03-04 15:57:01 +11:00
Ryan ZHAO
70b96fbe73 send configuration message using new sending pipeline 2021-03-04 15:37:42 +11:00
Ryan ZHAO
a1d1b864e6 fix closed group updating 2021-03-04 15:16:47 +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
Ryan ZHAO
88ac390495 plug in closed group message sender 2021-03-04 14:54:32 +11:00
Ryan ZHAO
c51593a914 fix sending attachments including link previews 2021-03-04 14:03:18 +11:00
Ryan ZHAO
0fcef2d542 add padding for future & clean 2021-03-04 11:36:19 +11:00
Ryan ZHAO
152d403e2b fix send attachments to open groups 2021-03-03 15:58:36 +11:00
Ryan ZHAO
9a00906069 WIP debug sending attachments 2021-03-03 15:14:45 +11:00
Ryan ZHAO
0ea1ed15e7 WIP: make attachment work 2021-03-02 17:22:56 +11:00
Ryan ZHAO
4a9ac91e5f fix send text message to closed group 2021-03-02 14:30:16 +11:00
Ryan ZHAO
bb7334515c clean 2021-03-02 14:13:52 +11:00
Ryan ZHAO
8acbb3c366 fix send text message to open group 2021-03-02 14:13:12 +11:00
Ryan ZHAO
d9eaedd6ae hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
Niels Andriesse
242eb90d21 Update version number 1.7.4 2021-02-26 10:15:24 +11:00
Niels Andriesse
adfbcb5be0
Merge pull request #464 from hjubb/fix_npe_and_fail_contact_parse
fix: return early if no profile name (prefs likely invalid state) and ignore contacts whose publicKey fails to parse
2021-02-26 10:13:56 +11:00
jubb
85336238a7 fix: return early if no profile name (prefs likely invalid state) and ignore contacts whose publicKey fails to parse 2021-02-26 10:08:30 +11:00
Niels Andriesse
2a741049cc Update version number 1.7.3 2021-02-25 14:46:28 +11:00
Niels Andriesse
f2208f40b8
Merge pull request #462 from hjubb/config_contacts_sync_message
Config contacts sync message
2021-02-25 14:45:55 +11:00
jubb
21dc8d5fca fix: use double encoding for closed group stuff 2021-02-25 14:37:34 +11:00
jubb
9d55d842d2 refactor: formatting in line properly in ContactUtilities.kt 2021-02-25 13:27:45 +11:00
jubb
9a33fe8883 feat: generate serializable Contact info for configuration messages and pass in appropriate list to get current 2021-02-25 12:13:31 +11:00
Niels Andriesse
b6bb9ac902
Merge pull request #461 from RyanRory/profile-picture-update-fix
Fix profile picture update
2021-02-25 10:58:27 +11:00
Niels Andriesse
b2146f645b
Merge pull request #460 from RyanRory/screen-lock-fix
Screen lock fix
2021-02-25 10:58:09 +11:00
jubb
d1b41a8933 feat: generate protobufs for new contacts 2021-02-25 10:45:07 +11:00
jubb
af35b68cb6 feat: add required annotations to match iOS 2021-02-25 10:39:06 +11:00
jubb
ee1f9fc790 feat: add contacts message in config message 2021-02-25 10:38:45 +11:00
Niels Andriesse
631f77425b Minor refactoring 2021-02-25 10:30:56 +11:00
Niels Andriesse
d96552fd9d Minor refactoring 2021-02-25 10:24:00 +11:00
Ryan ZHAO
7a31c60799 fix the profile picture not updated right away 2021-02-25 10:18:38 +11:00
Ryan ZHAO
6c32815266 clean 2021-02-25 09:45:36 +11:00
Ryan ZHAO
bc5a1ce396 fix screen lock 2021-02-25 09:35:57 +11:00
Niels Andriesse
6f76f0046a
Merge pull request #458 from hjubb/config_profile_info
fix: orEmpty on profilePicture to prevent NPE for profile info
2021-02-24 16:41:46 +11:00
Niels Andriesse
6b146c762e
Merge pull request #451 from RyanRory/refactor_clean_0
The Refactor: Clean Step 0
2021-02-24 16:41:32 +11:00
Ryan ZHAO
d5343d5462 Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-24 16:39:04 +11:00
jubb
ea857110bf fix: orEmpty on profilePicture to prevent NPE 2021-02-24 16:32:01 +11:00
Niels Andriesse
851efb6f6e
Merge pull request #457 from hjubb/config_profile_info
Adding profile information to the config sync messages
2021-02-24 15:57:35 +11:00
Niels Andriesse
c92d04c82e
Merge pull request #456 from hjubb/pn_dont_notify_self_sends
Pn dont notify self sends
2021-02-24 15:57:15 +11:00