Commit Graph

2367 Commits

Author SHA1 Message Date
Jeff Huang 5c101e9466 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (164 of 164 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/zh_Hant/
2020-05-30 09:29:12 +00:00
Besnik Bleta 8e88fcb462 Translated using Weblate (Albanian)
Currently translated at 99.4% (163 of 164 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sq/
2020-05-30 09:29:10 +00:00
ganfra 959b679086 Clean files 2020-05-29 19:03:54 +02:00
ganfra 7df8b3a9bf Widgets: observe wellknown for integ config and open Jitsi in browser 2020-05-29 12:23:36 +02:00
ganfra 00f2d0249f Merge branch 'develop' into feature/integration_manager 2020-05-28 20:33:51 +02:00
ganfra 4465e6eea3 Widget: format url with roomId if needed 2020-05-28 20:26:34 +02:00
ganfra d4706b38b8 Widgets: display widget events in timeline 2020-05-28 20:04:41 +02:00
ganfra 31c82b4ba6 Widget: show room widgets in bottom sheet and fix some widget actions 2020-05-28 19:39:07 +02:00
ganfra cb80d8d349 Widget: add active widgets 2020-05-28 17:08:57 +02:00
ganfra 1fe0c8a3e9 Widgets: handle actions (revoke, delete, edit, open in browser) and permissions bottom sheet 2020-05-28 10:25:04 +02:00
Benoit Marty 81c1717384 Format strings 2020-05-27 18:49:34 +02:00
Benoit Marty 0fd0500d30
Merge pull request #1414 from RiotTranslateBot/weblate-riot-android-riotx-application
Update from Weblate
2020-05-27 17:50:06 +02:00
Weblate e39b177b5b Merge branch 'origin/develop' into Weblate. 2020-05-27 13:04:35 +00:00
yuuki-san c94856cdf8 Translated using Weblate (Slovak)
Currently translated at 95.7% (156 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sk/
2020-05-27 13:04:26 +00:00
Benoit Marty 6f804cab4d Avoid duplicated events in DB (one with localId and one with eventId from homeserver, once synced) 2020-05-27 11:27:54 +02:00
Benoit Marty cf3dbb378e Get uploaded files for e2e rooms, from local DB 2020-05-26 22:06:51 +02:00
ganfra e32716aa48 Widget: add room active widgets to RoomDetailViewState 2020-05-26 19:47:06 +02:00
ganfra 4b37ede8c2 Widget: handle sticker 2020-05-26 18:16:38 +02:00
ganfra dbe4c0c8e4 Remove duplicates from identity feature 2020-05-26 11:38:29 +02:00
ganfra 4f4afd6840 Widget post api: handle last methods 2020-05-26 11:29:42 +02:00
ganfra 7409fde650 Merge branch 'develop' into feature/integration_manager 2020-05-26 08:55:01 +02:00
ganfra cfa31e6332 Widgets: fix extracting user widgets 2020-05-26 08:31:19 +02:00
ganfra df973a6275 Widget: makes the integration manager screen mostly working 2020-05-26 08:07:09 +02:00
Benoit Marty 0509e76f18 var -> val 2020-05-25 23:54:53 +02:00
Benoit Marty e379ccf086 Extract MatrixConfiguration to its own file, for a better visibility 2020-05-25 23:53:36 +02:00
Benoit Marty 7ae52d676d Use directly java.net.proxy class 2020-05-25 23:50:10 +02:00
Benoit Marty 3d33018ffa
Merge pull request #1147 from unclejay80/http_proxy_init
added network proxy configuration
2020-05-25 23:43:11 +02:00
Benoit Marty 860595520b
Merge pull request #1401 from vector-im/feature/cleanup
Small PR with code cleanup
2020-05-25 17:30:31 +02:00
Benoit Marty f0f3e8ddb9 Uploads: auto-review 2020-05-25 17:05:17 +02:00
Benoit Marty 2adafbeb03 Uploads: use SenderInfo in TimelineEvent 2020-05-25 17:02:57 +02:00
Benoit Marty f3a5fb7fe3 Uploads: rework: provide information about the sender 2020-05-25 16:54:08 +02:00
Benoit Marty 88cba74cac Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
Benoit Marty e9ca876444 Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
Benoit Marty 8a9498bae4 Uploads: add the service and the task 2020-05-25 16:54:08 +02:00
Weblate d2598480c8 var -> val 2020-05-25 16:54:08 +02:00
Benoit Marty 6e57b06673 Ensure Filter model match the spec and add Javadoc 2020-05-25 16:54:08 +02:00
Benoit Marty e117fec74f Kotlin: use orEmpty() for Maps 2020-05-25 14:07:25 +02:00
Benoit Marty 6e01b75b2f Dagger: use generic name for parameters 2020-05-25 14:04:36 +02:00
Benoit Marty 691e7fe616 Kotlin: use orEmpty() 2020-05-25 14:04:36 +02:00
MamasLT e31693b4b7 Translated using Weblate (Lithuanian)
Currently translated at 2.5% (4 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/lt/
2020-05-25 00:29:10 +00:00
MamasLT 45e5fff622 Added translation using Weblate (Lithuanian) 2020-05-23 23:44:45 +00:00
Osoitz 5267ba240a Translated using Weblate (Basque)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/eu/
2020-05-23 14:29:00 +00:00
Benoit Marty 330a33a0e8 Render formatted_body for m.notice and m.emote (Fixes #1196) 2020-05-21 01:47:17 +02:00
Benoit Marty b75b299847 Create MessageContentWithFormattedBody interface 2020-05-21 01:05:47 +02:00
Benoit Marty 7c59bcc928 Only "org.matrix.custom.html" is supported 2020-05-21 00:41:36 +02:00
Benoit Marty 628439aa65 Mardown: sending "**text in bold** was sending extra paragraph and extra new line 2020-05-21 00:25:59 +02:00
ganfra 00fd067c6b Widget: continue working on interaction with SDK. Not sure yet how to manage properly distinction between room and "admin" widgets. 2020-05-20 20:39:18 +02:00
Benoit Marty ca37895619
Merge pull request #1374 from vector-im/feature/sas_v2
support new key agreement method for SAS
2020-05-20 18:32:01 +02:00
Kim Brose 91d396fbca Translated using Weblate (German)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/de/
2020-05-20 15:29:32 +00:00
ganfra 3faf42be53 Widget: get user list widgets from user account 2020-05-19 18:40:11 +02:00
ganfra dea903bcb5 Merge branch 'develop' into feature/integration_manager 2020-05-19 16:08:46 +02:00
ganfra e1c6542e03
Merge branch 'develop' into feature/forward_pagination 2020-05-19 15:25:33 +02:00
ganfra 01484978bd Fix lint 2020-05-19 15:24:36 +02:00
ganfra cad14c93d0 Timeline: fix tests and add message order check 2020-05-19 14:39:42 +02:00
Valere f2fa57224b Update matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
2020-05-19 09:55:45 +02:00
Valere e0977dd97b Add new key agreement protocol 2020-05-19 09:55:45 +02:00
Benoit Marty 243b0a7d82 ktlint 2020-05-18 17:23:33 +02:00
Benoit Marty e67e472025 Integrate Valere's remarks - step 2: Stop using (or at least reduce usage of) GlobalScope 2020-05-18 17:23:33 +02:00
Benoit Marty a6541481bf Integrate Valere's remarks - step 1 2020-05-18 17:23:33 +02:00
Benoit Marty 789bcc8d77 Identity: Bugfix: do not fail when trying to disconnect the current identity server, if there is no token available 2020-05-18 17:23:33 +02:00
Benoit Marty 2914117a8e Move some classes 2020-05-18 17:23:33 +02:00
Benoit Marty 8049962a99 Create a Wellknown module, because both AuthModule and HomeServerCapability module need it 2020-05-18 17:23:33 +02:00
Benoit Marty 225b1c380e Identity: retrieve the default identity server url 2020-05-18 17:23:33 +02:00
Benoit Marty 60d80ea0ba Fix compilation issue after rebase 2020-05-18 17:23:33 +02:00
Benoit Marty c8211098f3 Identity: The store has to be migrated properly because it contains user's data 2020-05-18 17:23:33 +02:00
Benoit Marty e78fde4eca Identity: rename a few class and add a mapper to avoid using Entities in the code 2020-05-18 17:23:33 +02:00
Benoit Marty 59d60813fb Cleanup 2020-05-18 17:23:33 +02:00
Benoit Marty 4c31e52892 Add facilities and Javadoc on SessionParams data class 2020-05-18 17:23:33 +02:00
Benoit Marty c646fd2b36 ktlint 2020-05-18 17:23:33 +02:00
Benoit Marty 6432859732 Avoid code duplication 2020-05-18 17:23:33 +02:00
Benoit Marty 2beef7d816 Identity: fix issue with logout request.
Also disconnect previous set identity server when changing url, when disconnecting, and when deactivating account
2020-05-18 17:23:33 +02:00
Benoit Marty 7a4d9370e3 Identity: human readable errors 2020-05-18 17:23:33 +02:00
Benoit Marty d14f1dd1ab Capability: do not update data if the corresponding request fails 2020-05-18 17:23:13 +02:00
Benoit Marty 88e8c11ee5 Identity: protect against outdated homeserver 2020-05-18 17:23:13 +02:00
Benoit Marty 7afc7bdb31 Identity refresh main setting page. 2020-05-18 17:23:13 +02:00
Benoit Marty 4b2f8e9174 Auto-review 2020-05-18 17:23:13 +02:00
Benoit Marty a17932e17e Add missing `internal` 2020-05-18 17:23:13 +02:00
Benoit Marty 084c27a2bb Identity: cleanup 2020-05-18 17:23:13 +02:00
Benoit Marty ed2f62cbe7 Identity: ping API V2 and cleanup 2020-05-18 17:23:13 +02:00
Benoit Marty 4510aff00a ktlint 2020-05-18 17:22:40 +02:00
Benoit Marty ae0d09a049 Identity: cancel binding WIP 2020-05-18 17:22:40 +02:00
Benoit Marty 69759b7415 Identity: store sendAttempt in DB 2020-05-18 17:22:40 +02:00
Benoit Marty 7e8e1ab9b7 Identity: change DB and add sendAttempt 2020-05-18 17:22:40 +02:00
Benoit Marty b44f5d3b4a Handle correctly the verification code error case 2020-05-18 17:22:40 +02:00
Benoit Marty 03f8b66993 Remove undocumented parameter
https://github.com/matrix-org/sydent/issues/195
2020-05-18 17:22:40 +02:00
Benoit Marty e411f139c8 Identity: validate code received by SMS 2020-05-18 17:22:40 +02:00
Benoit Marty e962d1dadf Small improvement 2020-05-18 17:22:40 +02:00
Benoit Marty 756b0febe6 Identity: Add some doc 2020-05-18 17:22:40 +02:00
Benoit Marty 1535f3e2e5 Identity: bind/unbnd: restore the bind in progress State 2020-05-18 17:22:40 +02:00
Benoit Marty 3e808dec90 Identity: bind/unbnd WIP 2020-05-18 17:22:40 +02:00
Benoit Marty 637f4a8350 Fix small UI bug 2020-05-18 17:22:40 +02:00
Benoit Marty ffd8ac859d Identity: fix sync of indetity server change 2020-05-18 17:22:40 +02:00
Benoit Marty 6e43e9b51c Identity: refresh pepper, logout feature and other improvements 2020-05-18 17:22:40 +02:00
Benoit Marty e86460b578 Import and adapt Terms Of Service management: SDK and UI (compiling) 2020-05-18 17:22:40 +02:00
Benoit Marty 8dd5f88dba Identity: cleanup UI 2020-05-18 17:21:59 +02:00
Benoit Marty 3aa6de7cf5 Identity: progressing 2020-05-18 17:21:59 +02:00
Benoit Marty a75242c79d Retrieve ThreePids from homeserver 2020-05-18 17:21:59 +02:00
Benoit Marty 784918350b Identity: import UI/UX From Riot and adapt to RiotX architecture 2020-05-18 17:21:59 +02:00
Benoit Marty 0199cf9a03 Identity - Fix issue with Realm 2020-05-18 17:21:59 +02:00
Benoit Marty ab6e7a3b8a Identity - WIP (compilation ok) 2020-05-18 17:21:59 +02:00
Benoit Marty f489265ce7 Create AccessTokenProvider 2020-05-18 17:21:59 +02:00
Benoit Marty 6c9c3e5cb3 To merge with previous previous commit 2020-05-18 17:21:59 +02:00
Benoit Marty 9b7c2599a7 Add withOlmUtility facility 2020-05-18 17:21:59 +02:00
Benoit Marty 25bbd7c526 Identity - Create DB 2020-05-18 17:21:59 +02:00
Benoit Marty d45653dbb3 Ganfra's review: Improve the filters declaration 2020-05-18 16:26:18 +02:00
Benoit Marty f70623beea Ganfra's review: Handle filterRedacted in TimelineHiddenReadReceipts 2020-05-18 16:26:18 +02:00
Benoit Marty e542e4ba22 Add a setting to hide redacted events (#951) 2020-05-18 16:26:18 +02:00
Priit Jõerüüt 5a834619c0 Translated using Weblate (Estonian)
Currently translated at 97.5% (159 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/et/
2020-05-16 18:28:43 +00:00
ganfra 458e3ee5e8 Timeline: fetch next token with the help of getContext when required 2020-05-15 20:18:07 +02:00
Benoit Marty 5fa247a0c5 Remove temporary tool and strings_riotX.xml temporary files 2020-05-15 15:50:15 +02:00
Benoit Marty 8eebcef4e9 Fix #1373 2020-05-15 15:36:52 +02:00
Benoit Marty 7a2aefd8fb Format string resources 2020-05-15 12:46:20 +02:00
Weblate 8883832b86 Merge branch 'origin/develop' into Weblate. 2020-05-15 10:09:23 +00:00
Priit Jõerüüt b2bacdfa4e Translated using Weblate (Estonian)
Currently translated at 92.6% (151 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/et/
2020-05-15 10:04:36 +00:00
ganfra 22e3b370e3 IntegrationConfig: make preferred non null as we should at least get the default one 2020-05-14 17:54:27 +02:00
ganfra 8f5589d3e1 Start creating the widget url builder 2020-05-14 17:05:22 +02:00
Priit Jõerüüt 8cc82fe5ba Added translation using Weblate (Estonian) 2020-05-14 08:13:31 +00:00
tleydxdy 37392b5495 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/zh_Hans/
2020-05-13 23:28:38 +00:00
ganfra 996aa9ef66 Merge branch 'develop' into feature/integration_manager 2020-05-13 20:21:48 +02:00
ganfra 91301197ea Try to communicate with WidgetPostAPI 2020-05-13 20:04:08 +02:00
Valere 8d32c27ce0 Fix crash 1364 2020-05-13 16:57:57 +02:00
Benoit Marty f717a37a4a Split long line 2020-05-13 15:28:05 +02:00
Benoit Marty d8b1372a0f Login request does not provide the full Wellknown data. Change the model to reflect that, to avoid misunderstanding. 2020-05-13 14:03:10 +02:00
Benoit Marty 678cf50dbd Add Javadoc 2020-05-13 13:56:33 +02:00
Benoit Marty cf7de8bb8b Typo 2020-05-13 12:43:54 +02:00
Benoit Marty a70fdedce5 Try to use wellKnown request, when user is entering a homeserver URL 2020-05-13 12:43:54 +02:00
Benoit Marty c9bc6f4a9e Support homeserver discovery from MXID - Wellknown (#476) 2020-05-13 12:42:08 +02:00
Benoit Marty aea9c958bf
Merge pull request #1307 from vector-im/feature/invite_members_to_room
Invite members to an existing room
2020-05-13 00:29:55 +02:00
Tirifto df762e40bb Translated using Weblate (Esperanto)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/eo/
2020-05-12 12:28:46 +00:00
ganfra 01d6b52a60 Widgets: handle scalar token 2020-05-11 20:00:50 +02:00
ganfra ce884ac577 Merge branch 'develop' into feature/integration_manager 2020-05-11 15:48:27 +02:00
Benoit Marty 6abc51d05d
Merge pull request #1339 from vector-im/feature/openId
Create a specific module for OpenId
2020-05-11 15:41:41 +02:00
Tirifto 247ffc1270 Translated using Weblate (Esperanto)
Currently translated at 82.2% (134 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/eo/
2020-05-09 16:28:37 +00:00
laeberkaes 8616c454e1 Translated using Weblate (German)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/de/
2020-05-08 06:28:31 +00:00
Samu Voutilainen 6c1c1ca8b0 Translated using Weblate (Finnish)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/fi/
2020-05-08 06:28:30 +00:00
Besnik Bleta 67d1c2dc80 Translated using Weblate (Albanian)
Currently translated at 98.8% (161 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sq/
2020-05-08 06:28:28 +00:00
Ville Ranki 0aa90c3eea Translated using Weblate (Finnish)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/fi/
2020-05-07 06:15:43 +00:00
Benoit Marty 750550ad3e Create a specific module for OpenId 2020-05-06 22:14:56 +02:00
ganfra b047f36e86 Creates a Widget Manager to be used internally and state event service 2020-05-06 20:49:07 +02:00
ganfra 4fdd2f4eed Create WidgetsAPI 2020-05-06 15:53:28 +02:00
Valere 583139d51e klint 2020-05-06 15:06:34 +02:00
Valere cee8ae3af4 Fix #1329
+ migration to remove duplicate
2020-05-06 15:04:17 +02:00
ganfra 182753e4ec Start creating integration manager 2020-05-06 11:53:35 +02:00
onurays c7c6cf70e4 Code review fixes. 2020-05-06 11:20:08 +03:00
ganfra 29c9d3070c Start creating bunch of necessary classes 2020-05-05 13:05:45 +02:00
Benoit Marty a4b8dc9400 Fix test compilation issue 2020-05-05 11:49:03 +02:00
Benoit Marty ffeae7ec83 Fix timeline navigation when opening an event in a previous lastForward chunk.
In this case, we do not have a nextToken, but there are more event to load. So we perform a GET /context on the last known event.
Not sure it is correct to do that though...
2020-05-05 02:41:32 +02:00
Benoit Marty 17ddb5ce43 if all events are rendered in the timeline (developer mode), render the room creation event. 2020-05-05 02:41:32 +02:00
Benoit Marty 53583c691f Add some logs 2020-05-05 02:41:32 +02:00
Benoit Marty 2b9d3960b3 Improve tests 2020-05-05 02:41:32 +02:00
Benoit Marty 92befcde5d Add test to cover previous last forward case (passing) 2020-05-05 02:41:32 +02:00
Benoit Marty 697eaec197 TI: After jump to unread, newer messages are never loaded (#1008) 2020-05-05 02:41:32 +02:00
Benoit Marty 86fba28313 After jump to unread, newer messages are never loaded (#1008) 2020-05-05 02:41:32 +02:00
Benoit Marty f3c3c07d46 Kotlin sugar 2020-05-05 00:14:57 +02:00
Benoit Marty 8966e24925 Create a debug method to send x times the same event 2020-05-05 00:14:57 +02:00
Benoit Marty becc5a7b54 Add assertion in debug 2020-05-05 00:14:57 +02:00
Benoit Marty a61434ae08 doc 2020-05-05 00:14:57 +02:00
Benoit Marty 20b726819f Rename "LastLive" -> "LastForward" 2020-05-05 00:14:57 +02:00
Benoit Marty bfd847179f Wait more 2020-05-05 00:14:57 +02:00
Benoit Marty 7e955ef0e4 Add possibility to create clear room 2020-05-05 00:14:57 +02:00
Benoit Marty 2697800deb Doc and cleanup 2020-05-05 00:14:57 +02:00
Benoit Marty 2c47fe9f0d typo 2020-05-05 00:14:57 +02:00
Valere 4578b9df7f Fix / froezn object migration 2020-05-04 18:27:38 +02:00
Benoit Marty 1f528ee428 Format strings 2020-05-04 16:00:11 +02:00
Szimszon b45504d97a Translated using Weblate (Hungarian)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/hu/
2020-05-04 11:50:57 +00:00
Ville Ranki 5fff637bee Translated using Weblate (Finnish)
Currently translated at 99.4% (162 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/fi/
2020-05-04 11:50:55 +00:00
random 2f5d824c65 Translated using Weblate (Italian)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/it/
2020-05-03 14:14:24 +00:00
Kévin C 3100473305 Translated using Weblate (French)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/fr/
2020-05-03 14:14:24 +00:00
Jeff Huang 0d12a80832 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/zh_Hant/
2020-05-03 14:14:24 +00:00
Akarshan Biswas 5d26b6a7cb Translated using Weblate (Bengali (India))
Currently translated at 12.3% (20 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/bn_IN/
2020-05-03 14:14:24 +00:00
Akarshan Biswas 68c1e8fc6d Added translation using Weblate (Bengali (India)) 2020-05-03 14:14:24 +00:00
yuuki-san 1ffd7dbb9f Translated using Weblate (Slovak)
Currently translated at 92.6% (151 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sk/
2020-05-03 14:14:24 +00:00
Slavi Pantaleev 779f380d2f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/bg/
2020-05-03 14:14:24 +00:00
Valere d27b73f6be Fix / Crash on bootstrap
Exception: java.lang.IllegalArgumentException: 'value' is not a valid managed object.
2020-05-03 11:36:40 +02:00
Onuray Sahin d2f0957eba
Merge branch 'develop' into feature/invite_members_to_room 2020-04-30 16:11:52 +03:00
onurays cf5d89ea9b Documentation added for new parameter excludedUserIds. 2020-04-30 15:40:54 +03:00
onurays 5dc50195b3 Filter existing room members. 2020-04-30 15:28:20 +03:00
onurays 57a87ba620 Add InviteUsersToRoomActivity and mvrx classes. 2020-04-30 13:54:09 +03:00
Benoit Marty f6cbc15cf7 Several fixes on room creation collpasing events (Fixes #1309)
- do not collapse room member events
- collapse other type of event: topic, alias, canonical alias, powel level
- Use correct user name for collapsed version (should be fixed twice due to the previous change of excluding some room member events)
- align "join" and "left" string with Riot-Web
2020-04-30 12:52:21 +02:00
Benoit Marty 7322144dc8 Remove duplicated strings 2020-04-30 12:15:26 +02:00
Valere 7b20db64a5
Merge branch 'develop' into feature/e2e_timeline_decoration 2020-04-30 12:01:44 +02:00
Valere 429c634ed9
Merge pull request #1308 from vector-im/feature/fix_dm_shield_logic
Fix / Move DM shield rules to task
2020-04-30 12:00:18 +02:00
Valere 05230a6afa Code review 2020-04-30 11:38:32 +02:00
Valere 43eb804b23
Merge pull request #1303 from vector-im/feature/xs_old_new_session_detection
Feature/xs old new session detection
2020-04-30 11:23:15 +02:00
Valere 6ea38c7eb0 Fix / Move DM shield rules to task 2020-04-30 10:55:25 +02:00
Valere 0d0af6906e Code review 2020-04-30 10:10:56 +02:00
Valere f0a9be2ec7 Better session detection 2020-04-29 18:46:36 +02:00
Valere 8955e5461c Add retry to sendToDeviceTask 2020-04-29 18:45:51 +02:00
Valere 087ff1c041 Fix / race when receive accept in sending start in to device 2020-04-29 18:44:25 +02:00
Valere 7b46c49ded Fix / missing primary key for migration 2020-04-29 16:35:50 +02:00
Valere da5672d229 Fix / ensure ux aware of wait 2020-04-29 16:18:01 +02:00
Valere 0f00597444 Fix / Regression on non e2e device
+ migrate to new rx objects
2020-04-29 12:35:22 +02:00
Valere a806f70b35 New security alert to review old sessions 2020-04-29 12:04:59 +02:00
Benoit Marty 67f07bd1bb
Merge pull request #1297 from vector-im/feature/xsigning_trust_optimization
Feature/xsigning trust optimization
2020-04-29 10:32:29 +02:00
Benoit Marty 4dc0b00569 Import string from Matrix SDK 2020-04-28 23:54:35 +02:00
ganfra 8942ce964a Fix android test not compiling 2020-04-28 19:09:20 +02:00
ganfra 43055964ba Crypto store : avoid copying before mapping to other data 2020-04-28 16:26:04 +02:00
Benoit Marty b4247c89e4 Make fun internal 2020-04-28 14:15:50 +02:00
ganfra 4e8177f738 Fix lint 2020-04-28 13:10:44 +02:00
Valere 8871390167 Code review 2020-04-28 12:25:50 +02:00
ganfra fc86e7e1f6 ShieldTrust: use only active members 2020-04-28 11:00:41 +02:00
ganfra 21912c290a XSigning keys: use json instead of object serialization 2020-04-28 10:59:51 +02:00
Benoit Marty 8bd4cc8f54
Merge pull request #1277 from vector-im/feature/sso
Use correct sso url
2020-04-27 14:36:37 +02:00
Benoit Marty a233e9b0a0 Avoid code duplication, and improve readability 2020-04-27 14:25:45 +02:00
Valere 114bce5f64 Fix / DB crash due to deserializaion 2020-04-24 16:50:56 +02:00
Valere 20e5ebc88b Decorate timeline with e2e warning 2020-04-24 16:50:56 +02:00
Benoit Marty 8daf72a4b0 Use correct URL for SSO connection (#1178) 2020-04-24 15:54:02 +02:00
Benoit Marty 51eb2cda95 Move some constants to the Matrix SDK 2020-04-24 15:53:30 +02:00
Benoit Marty af0b798ef1 Ensure Timber log output when running tests
to squash
2020-04-24 13:38:28 +02:00
Benoit Marty 51be8d5ed5 Remove previous temporary solution 2020-04-24 13:26:25 +02:00
Benoit Marty 270bed5013 EventBus logs using Timber 2020-04-24 11:57:49 +02:00
Benoit Marty 20b3c33fb0 Remove bad comment 2020-04-24 11:57:49 +02:00
Benoit Marty b2aaf1cca1 CurlLoggingInterceptor now uses Timber to log 2020-04-24 11:57:49 +02:00
Benoit Marty 4ee13b6fa1
Merge branch 'develop' into feature/unwedging 2020-04-23 18:20:09 +02:00
Valere 736905edf8
Merge pull request #1269 from vector-im/feature/complete_security_hide_4s
Hide Use recovery key when 4S is not setup
2020-04-23 18:03:14 +02:00
Benoit Marty e8a91eab88
Merge pull request #1265 from vector-im/feature/deactivate
Deactivate account using password
2020-04-23 17:30:08 +02:00
Valere 7e0591ffee Hide Use recovery key when 4S is not setup 2020-04-23 11:14:20 +02:00
Valere e37dd547b8 code review 2020-04-22 18:50:59 +02:00
Benoit Marty 671c1259af
Merge pull request #1239 from waylon531/develop
Use a bigger thread pool
2020-04-22 18:23:37 +02:00
Benoit Marty 03b9774c56 ktlint 2020-04-22 17:56:13 +02:00
Valere 9b320ed3c7 Fix unwedging 2020-04-22 15:40:59 +02:00
Benoit Marty 5755d5bfaa Deactivate account: unit test and cleanup 2020-04-22 14:36:01 +02:00
Benoit Marty ff320fec55 Move internal class to internal package 2020-04-21 20:47:49 +02:00
Benoit Marty 8c8a84b039 Account deactivation: the task does the cleanup 2020-04-21 20:41:10 +02:00
Benoit Marty 045e3d7bae Account deactivation (with password only) (#35) 2020-04-21 20:31:54 +02:00
Benoit Marty eca3bf0817 typo 2020-04-21 13:49:36 +02:00
Benoit Marty c39a0e4fd5 timout -> timeout 2020-04-21 00:29:44 +02:00
Benoit Marty c1acb1af66 Add integration test for change password feature 2020-04-21 00:23:01 +02:00
Valere 8a4f0a0c00 KeyBackup / Use 4S if key in quadS 2020-04-20 19:21:44 +02:00
Benoit Marty a6368c473e Restart broken Olm sessions ([MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719)) 2020-04-20 18:07:14 +02:00
Benoit Marty 3615ca6b95 VersionName can be null when running integration test 2020-04-20 18:07:14 +02:00
Benoit Marty ddb00ba23a Enable Timber log in integration tests 2020-04-20 18:07:14 +02:00
Benoit Marty 91cf4b647d var -> val 2020-04-20 18:07:14 +02:00
Benoit Marty f989eed8b0 Use @Throws(MXCryptoError::class) 2020-04-20 18:07:14 +02:00
Benoit Marty 4d296ddc09 Avoid injecting credentials 2020-04-20 18:07:14 +02:00
Benoit Marty 6186c22e02 improve code 2020-04-20 18:07:14 +02:00
Benoit Marty 13cd13a42f Create RoomEncryptorsStore 2020-04-20 18:07:14 +02:00
Benoit Marty a42eb42178 Avoid injecting Credentials 2020-04-20 18:07:14 +02:00
Benoit Marty 7924ef207c Add Javadoc 2020-04-20 18:07:14 +02:00
Benoit Marty 5900245018 Make the test fail before unwedging implementation 2020-04-20 18:07:14 +02:00
Benoit Marty 00c239bc42 cleanup 2020-04-20 18:07:14 +02:00
Benoit Marty 0cb43eef51 Add test for Unwedging (before implementing it) 2020-04-20 18:07:14 +02:00
Benoit Marty 41a8f40241 Improve API 2020-04-20 18:07:14 +02:00
Benoit Marty a8641ef879 Split KeysBackup to several files. No other change. 2020-04-20 18:07:14 +02:00
Valere 1227de3f9c
Merge pull request #1256 from vector-im/feature/increase_default_timeout
Increase default timeout to match old riot
2020-04-20 17:13:59 +02:00
Valere c7ac5e2293 Increase default timeout to match old riot 2020-04-20 11:26:03 +02:00
Valere 28c6921a0a Avoid unnecessary /device call 2020-04-17 18:08:29 +02:00
Waylon Cude 68f93c6c31
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-04-16 12:19:17 -07:00
Benoit Marty ac07fb47d7 Better Kotlin code 2020-04-16 17:42:55 +02:00
Benoit Marty 5652140f5d Improve ContentUrlResolver 2020-04-16 16:41:45 +02:00
Benoit Marty e97c95f40a Fix issue with media path (Fixes #1227) 2020-04-16 16:41:45 +02:00
Benoit Marty cc94b6cf7d
Merge pull request #1116 from vector-im/feature/worker_manager
Add some documentation on Workers
2020-04-16 16:28:20 +02:00
Valere 66fc38ad4b Remove GlobalScope usage 2020-04-16 15:09:16 +02:00
Valere 621e78a864
Merge pull request #1235 from vector-im/feature/upgrate_cross_signing
Add migration state to bootstrap
2020-04-16 15:04:06 +02:00
Benoit Marty 828e972c74 Split long lines 2020-04-16 14:35:55 +02:00
Benoit Marty 79e81dbdde ktlint 2020-04-16 14:01:15 +02:00
Benoit Marty f93f50b582 Code readability 2020-04-16 14:00:24 +02:00
Waylon Cude d20cf484ff
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-04-16 03:10:06 -07:00
waylon531 6c1719e365
Use a bigger thread pool
This patch makes RiotX use an unbounded thread pool to handle
connections. The default thread pool for the android WorkManager has a
fairly anemic number of threads and I suspect this was causing
performance issues especially because of all the long-running jobs that
happen whenever you sync.

I tested this out on my phone and all of the sluggishness appears to
have gone away. I tested both the debug and release builds to make sure
it wasn't just some release optimization. RiotX is so much snappier now!

This fixes #1221

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-04-16 02:44:31 -07:00
Benoit Marty 467f48f1a6 Merge remote-tracking branch 'origin/develop' into develop 2020-04-16 11:33:22 +02:00
Valere 0edc562120 Fix / test compilation 2020-04-16 11:30:10 +02:00
Valere aa496e6efb Add migration state to bootstrap 2020-04-16 11:30:10 +02:00
Benoit Marty ea03f76847
Merge pull request #1129 from vector-im/feature/update_password
Change password function implemented.
2020-04-16 11:26:33 +02:00
Benoit Marty d74a5f9979 Typo 2020-04-16 11:23:41 +02:00
Benoit Marty 17ece54cb0 `mimetype` field is optional 2020-04-16 10:28:23 +02:00
Benoit Marty f6f6fa99fb
Merge pull request #1223 from vector-im/feature/cross_signing_as_task
Make initialize cross signing as a task
2020-04-15 17:21:25 +02:00
Benoit Marty 6201a9b8ef
Merge branch 'develop' into feature/fix_download_file 2020-04-15 16:52:40 +02:00
Benoit Marty 1981d2e9ac
Merge pull request #1233 from vector-im/feature/fix_local_echo_no_update
Fix / sending event not always updating
2020-04-15 16:51:16 +02:00
Benoit Marty 9fe32fe915 Change password: hide the preference (as Riot-Web does) if it is not possible to change the password. 2020-04-15 16:39:05 +02:00
Benoit Marty 85493b7532 Code review: use isInvalidPassword() extension everywhere. Also be robust if the Fragment is destroyed 2020-04-15 16:38:44 +02:00
onurays dbabe0232f Do not override the default timeout. 2020-04-15 16:38:44 +02:00
onurays dfc8e8ec4c AccountService is created. 2020-04-15 16:38:44 +02:00
onurays f00db49bda Change password function implemented.
Fixes #528
2020-04-15 16:38:44 +02:00
onurays b4a3eb2cb3 Fix return the exception instead of empty one. 2020-04-15 16:39:41 +03:00
Benoit Marty c57fa3f0d0
Merge pull request #1176 from vector-im/feature/target-sdk-29
Increase targetSdk to 29
2020-04-15 14:32:16 +02:00
Benoit Marty 6639f89a68 Simpler code 2020-04-15 12:53:08 +02:00
Valere f2b684aa9e Fix / user and self signing failing
bad copy paste
2020-04-14 18:23:20 +02:00
Valere 68ca0e9d4b Fix / sending event not always updating 2020-04-14 17:35:11 +02:00
Benoit Marty ef6847671a Import strings from Riot 2020-04-14 17:13:43 +02:00
onurays 190fbb95ec Merge branch 'develop' into feature/target-sdk-29
# Conflicts:
#	vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
2020-04-14 13:59:54 +03:00
onurays 7242cbda40 Catch network errors during file downloading.
Fixes #1229
2020-04-13 17:48:19 +03:00
Valere 9e3011d4c8 Make initialize cross signing as a task 2020-04-10 17:04:34 +02:00
Valere ccacd20428
Merge branch 'develop' into feature/verification_unified_emoji 2020-04-10 16:05:33 +02:00
Valere 5081361c2d Update Scan confirm flow 2020-04-10 12:12:06 +02:00
Valere 8357abd455 Added prefix to resources to avoid accidental override 2020-04-10 11:18:41 +02:00
Valere ede899d78e Fix / Bad smiley emojii 2020-04-10 11:09:16 +02:00
Valere a703574004 Uniform emoji representation for all platform 2020-04-10 11:02:33 +02:00
Onuray Sahin 8a4a288074
Merge branch 'develop' into feature/target-sdk-29 2020-04-08 14:15:02 +03:00
onurays 5b1f887760 Code review fixes. 2020-04-08 14:10:31 +03:00
Valere 12abca1b80 Fix / Send gossip request on other done received 2020-04-07 19:09:56 +02:00
Valere 8904ca27f2 clean 2020-04-07 15:30:19 +02:00
Valere 6c5da97c16 code review 2020-04-07 15:25:31 +02:00
Valere d4d73db5ae keybackup gossip test 2020-04-07 15:15:45 +02:00
Valere 1a436f962f update change log
cleaning
2020-04-07 15:15:45 +02:00
Valere dc61ee61f5 Fix / wrong export format 2020-04-07 15:15:45 +02:00
Valere 5b4b5e7a57 Gossip keybackup key after verification! 2020-04-07 15:15:45 +02:00
Valere 153587bd82
Merge branch 'develop' into feature/crosssigning_bootstrap 2020-04-07 15:14:43 +02:00
Valere c91bc82cd9 Fix / Ensure encryption set even if faield to fetch members 2020-04-03 13:35:09 +02:00
Valere 8b481e2294 Remove dead code 2020-04-03 13:34:38 +02:00
Valere 2f237cf17b klint 2020-04-02 16:51:40 +02:00
Valere bf5ba99653 Full bootstrap flow initial commit 2020-04-02 16:51:03 +02:00
Valere 8ecdac7c31 Fixes #1191 2020-03-31 17:08:11 +02:00
Onuray Sahin 443d45db6a
Merge branch 'develop' into feature/target-sdk-29 2020-03-27 12:21:39 +03:00
Valere a995615f87 Fix / protect against crash during migration 2020-03-26 18:20:12 +01:00
Valere 5244612ef6 Update shield logic for DM 2020-03-26 14:26:34 +01:00
onurays 4b7da9ae6b Replace deprecated getExternalStoragePublicDirectory with getExternalFilesDir. 2020-03-26 15:57:21 +03:00
onurays f7cbc01023 Replace deprecated PreferenceManager with androidx version. 2020-03-26 15:56:33 +03:00
onurays 12429d8091 Merge develop into the branch. 2020-03-26 14:39:50 +03:00
Onuray Sahin 3bb5e127d6
Merge pull request #1155 from vector-im/feature/multipicker
Multiple attachment picker implementation
2020-03-26 14:30:02 +03:00
Valere 6721f337bd
Merge branch 'develop' into feature/ensure_olm_account_unicity 2020-03-26 12:11:00 +01:00
Valere 535cdf0ef5
Merge pull request #1162 from vector-im/feature/xs_detect_new_session
Feature/xs detect new session
2020-03-26 12:06:18 +01:00
Valere 19990b27bb Code review 2020-03-26 10:52:02 +01:00
Valere b6fe80faf4 Fix / device key could be rotated
MXOlmDevice constructor access IMXStore before is open (dagger)
2020-03-26 10:35:43 +01:00
onurays c63f3edb06 Initial fixes to support targetSdk 29. 2020-03-26 12:06:50 +03:00
Valere 9a6fe1af4e Fixes #1174 2020-03-26 09:49:34 +01:00
onurays 5cb47dae35 Return a failure message if the file cannot be opened. 2020-03-25 18:03:20 +03:00
onurays f68e98b2c7 Do not resize video thumbnail. 2020-03-25 17:35:18 +03:00
Valere ee7828a445 Code quality 2020-03-24 16:21:22 +01:00
Valere 37ac45c90a Fix / handling of back 2020-03-24 15:51:09 +01:00
Valere 2de8865730 Fix / Key Request recipients 2020-03-24 15:49:41 +01:00
Valere cfcec04029 code cleaning 2020-03-24 14:57:51 +01:00
Valere 22642e71a3 cleaning 2020-03-24 10:06:36 +01:00
Valere fcd290410e Also cancel pending request on back 2020-03-24 10:06:15 +01:00
onurays 2651f82337 Refactor duplicated code. 2020-03-24 11:03:41 +03:00
Valere 3b62402cfe Fix / ensure keys trust is updated before checking devices 2020-03-23 19:15:29 +01:00
Valere 6cc8d1b205 Fix / concurrent start broke QR verification 2020-03-23 18:43:52 +01:00
Valere 49e5fafb2d New sign in detection flow 2020-03-23 16:27:32 +01:00
Valere e36367c040 Fix / sending secret encryption + refactoring 2020-03-23 16:27:17 +01:00
onurays f7fd23b153 App integration to the new multipicker library. 2020-03-23 16:31:32 +03:00
Valere 4f70c40b1a Refactor + share secret window implementation 2020-03-23 11:13:33 +01:00
onurays 6db0de321c Initial implementation of multipicker. 2020-03-20 12:12:59 +03:00
Valere 6fe77eba72 code review 2020-03-18 11:25:49 +01:00
Valere 286a5081ff Verif / handle concurrent start
Fixes #794
2020-03-18 10:07:57 +01:00
Valere 572b174cfe code quality 2020-03-17 14:42:55 +01:00
Valere b71d8185a2 Fix / gossiping sent to soon results in not getting keys
Overall improovment of logs
2020-03-17 14:40:05 +01:00
Valere 8051d9e3be cleaning 2020-03-17 14:40:05 +01:00
Valere 1bf8fef292 Fix realm migration 2020-03-17 14:40:05 +01:00
Valere 75549c41e0 View source in audit + clean 2020-03-17 14:40:05 +01:00
Valere 5e2f888eaf Request secret from mobile to web 2020-03-17 14:40:05 +01:00
Valere d3d6d44665 Post rebase fix 2020-03-17 14:40:05 +01:00
Valere fc6225a7ac Gossiping refactoring 2020-03-17 14:40:05 +01:00
Valere 3639007985 Cancel transaction if failed to decrypt other part events 2020-03-17 14:40:05 +01:00
Valere d5137897c1 Fix / crash No JsonAdapter for GossipingToDeviceObject 2020-03-17 14:40:05 +01:00
Valere b67735c31a Incoming Secret Share request support
crypto DB migration
2020-03-17 14:40:05 +01:00
Valere 8ff31ac49d cleaning klint 2020-03-17 14:40:05 +01:00
Valere 757e90986e Key Req Dev tool initial commit 2020-03-17 14:40:05 +01:00
Valere 06fc5c2dd9 Log tunning 2020-03-17 14:40:05 +01:00
Valere 8827b4b5ef Fix / correctly update local echo failed state
+ endure Workmanager queues are reset after a clear cache
2020-03-17 09:47:27 +01:00
unclejay a2367ef14f added network proxy configuration 2020-03-16 21:12:15 +01:00
Valere 7c1428e097 preserver relations as non encrypted 2020-03-12 10:05:55 +01:00
Valere 32fd4c1be9 save decryption result at encryption 2020-03-11 19:39:40 +01:00
Valere f53fc205e1 Fix Message transitions in encrypted rooms
Fixes #518
2020-03-11 18:07:18 +01:00
Valere 49f2064439 Fix / Self verification mode 1 was not working 2020-03-11 11:43:23 +01:00
Valere a9074cdbbb Remove dangerous runBlocking (and un-nedded) 2020-03-10 17:25:04 +01:00
Benoit Marty 13036a5933 Pusher: update javadoc 2020-03-06 16:37:13 +01:00
Benoit Marty a8e19f3cc9 Understanding things 2020-03-06 15:57:49 +01:00
Benoit Marty cb4752812a Hide private key 2020-03-06 15:53:55 +01:00
Benoit Marty ccd9d2961d Cleanup 2020-03-06 15:45:39 +01:00
Benoit Marty d1db17f244 Add doc on workers 2020-03-06 15:45:26 +01:00
Benoit Marty aa4327c4da Add doc and log error from the workers 2020-03-06 15:44:55 +01:00
Benoit Marty 35179509f2
Merge pull request #1111 from vector-im/feature/verification_code
Feature/verification code
2020-03-06 15:02:57 +01:00
Benoit Marty 23862cb3d0
Merge branch 'develop' into feature/notif 2020-03-06 14:43:23 +01:00
Benoit Marty 2b8e2a312b Avoid use toImmutableList() 2020-03-06 14:39:33 +01:00
Benoit Marty 62fdb4c27a Use getOrPut() 2020-03-06 14:37:30 +01:00
Benoit Marty b929a2f185
Merge pull request #1099 from vector-im/feature/fix_share_image
Share images from clear and encrypted rooms.
2020-03-06 14:27:47 +01:00
Benoit Marty fb858bc112 Rename to respect naming convention #3 2020-03-06 14:04:02 +01:00
Benoit Marty 5d0e917f04 Rename to respect naming convention #2 2020-03-06 13:50:00 +01:00
Benoit Marty e420070066 Rename to respect naming convention 2020-03-06 13:40:35 +01:00
Benoit Marty 4504308f25 Less "!!" 2020-03-06 13:34:12 +01:00
onurays 05683967c0 Code review fixes. 2020-03-06 12:07:38 +01:00
Benoit Marty 23c20acff1 Remove TODO 2020-03-06 10:11:30 +01:00
Benoit Marty be5e6eaa93 Rename parameter type for code clarity 2020-03-06 10:10:16 +01:00
Benoit Marty 2d456d93a7 Common code step 2 2020-03-05 18:16:05 +01:00
Benoit Marty de36a28541 Common code step 1 2020-03-05 18:00:35 +01:00
Benoit Marty 4634b963a2 Code cleanup 2020-03-05 17:55:13 +01:00
Benoit Marty b3f887ca28 Code quality 2020-03-05 17:30:34 +01:00
Benoit Marty 3425dd0a63 Make the tests compile and pass 2020-03-05 17:28:35 +01:00
Benoit Marty 2a774833ec More optimization 2020-03-05 17:11:52 +01:00
Benoit Marty bda4bbb59c More optimization 2020-03-05 16:45:49 +01:00
Benoit Marty 0828f9270e Create asValidObject method - make it works 2020-03-05 16:23:56 +01:00
Benoit Marty e326631752 Create asValidObject method - make it compiles #2 2020-03-05 15:39:01 +01:00
Benoit Marty a3f8a53a52 Create asValidObject method - make it compiles. 2020-03-05 15:29:44 +01:00
Benoit Marty 7b5a50ec6e Create asValidObject method - not compiling 2020-03-05 12:06:19 +01:00
Benoit Marty 36c52d24a7 Move method to interface step 3 2020-03-05 11:24:35 +01:00
Benoit Marty 1b29c7bf91 Move method to interface step 2 2020-03-05 11:22:42 +01:00
Benoit Marty b6aee04e24 Move method to interface step 1 2020-03-05 11:21:44 +01:00
onurays 03d2cd0639 Lint fix. 2020-03-04 17:57:57 +01:00
onurays b7ad50a3ce Make mimeType private to encourage using getSafeMimeType() method. 2020-03-04 16:52:52 +01:00
onurays 9cbaadedfb Unused context parameter is removed. 2020-03-04 16:52:08 +01:00
onurays d4384328fe Use "image/jpeg" instead of "image/jpg" 2020-03-04 16:26:09 +01:00
Benoit Marty 5fd8425289 Remove unused files 2020-03-04 16:09:37 +01:00
onurays 26d387cc12 Support sharing other media types. 2020-03-04 13:47:48 +01:00
onurays 319667096f Return Try.Failure instead of throwing exception. 2020-03-03 13:41:40 +01:00
onurays 5f14516dec Share images from clear and encrypted rooms. 2020-03-03 10:39:24 +01:00
Benoit Marty c13b636bae Code cleanup 2020-02-29 10:05:48 +01:00
Benoit Marty 551604cdcb Add missing push rules 2020-02-28 19:02:13 +01:00
Benoit Marty 8a2bafec5f Restore push rule settings - fix issues 2020-02-28 18:35:51 +01:00
Benoit Marty 3013e311a4 Restore push rule settings - WIP 2020-02-28 16:51:11 +01:00
Benoit Marty 1c35d07acc PushRuleService.getPushRules() now returns a RuleSet. Use getAllRules() on this object to get all the rules. 2020-02-28 16:29:58 +01:00
Benoit Marty 039924436f Json parsing 2020-02-28 14:51:35 +01:00
Valere 779026b0af Fix / mark master key as trusted after self verif 2020-02-28 11:46:32 +01:00
Benoit Marty b1b8513da4 Create fromBase64Safe() to parse data received from external source 2020-02-27 19:17:14 +01:00
Benoit Marty 0a9008a73d Be robust if other client sends padded base64 in the reciprocate 2020-02-27 18:35:05 +01:00
Benoit Marty 1ead2778c2 ... and rename the method fromBase64NoPadding() to fromBase64() 2020-02-27 18:33:57 +01:00
Benoit Marty 8299487f6d Avoid using encoder flag to decode Base64 string... 2020-02-27 18:13:42 +01:00
Benoit Marty ceab0903cf Improve code - TU passed 2020-02-27 18:09:37 +01:00
Benoit Marty a296234163 Fix crash after rework. RoomKeyShare is now an interface 2020-02-26 20:35:34 +01:00
Benoit Marty 6349f9828d Optimize import 2020-02-26 16:59:20 +01:00
Benoit Marty 989d396c78 Rename package "sas" to "verification" 2020-02-26 16:52:16 +01:00
Benoit Marty 4ba8a42977 Fix crash reported from rageshake 2020-02-26 15:32:52 +01:00
Benoit Marty 4280bc0780 Fix crash reported from rageshake 2020-02-26 14:10:51 +01:00
Benoit Marty 6622e0daca Code quality 2020-02-26 12:43:41 +01:00
Valere 9d1718cda8 post merge clean 2020-02-26 12:20:03 +01:00
Valere f7c128be3d Fix tests 2020-02-26 12:20:03 +01:00
Valere b4a783198b code review 2020-02-26 12:20:03 +01:00
Valere 0cfc9451ca Cleaning 2020-02-26 12:20:03 +01:00
Valere 4b75baf772 Fix / trust was not properly updated after 4S restore 2020-02-26 12:20:03 +01:00
Valere c579de1033 Fix / Test crash when crypto DB closed
Quick Work around
2020-02-26 12:20:03 +01:00
Valere d537abc522 Fix / sign current device after entering xsigning passphrase 2020-02-26 12:20:03 +01:00
Valere 030f027516 Fixes #1051
XSigning | Self verification Empty bottomsheet
2020-02-26 12:20:03 +01:00
Valere cbd7c1aa63 Fix / Bad ordering of active sessions 2020-02-26 12:20:03 +01:00
Valere bdb1df75d4 Check trust on crypto thread 2020-02-26 12:20:03 +01:00
Valere 817dc19b9a Cleaning 2020-02-26 12:20:03 +01:00
Valere f9be4fa2bd Fixes #1047 2020-02-26 12:20:03 +01:00
Valere 94d36e0c85 cleaning jni 2020-02-26 12:20:03 +01:00
Valere 0064934db9 Changed Encryption algorithm of 4S 2020-02-26 12:20:03 +01:00
Valere e2e4ddf5ba Post rebase fix 2020-02-26 12:20:03 +01:00
Valere 9a08f5ec4e WIP / Verify from passphrase UX 2020-02-26 12:19:31 +01:00
Valere 3dc89c8d87 Update Self Verification BottomSheet for quads 2020-02-26 12:15:59 +01:00
ganfra bddeb6cb72 Clean files 2020-02-26 11:50:41 +01:00
ganfra d57f6838e9 Remove decryption from room summary mapper and make TimelineEventDecryptor scoped to session 2020-02-26 11:50:41 +01:00
ganfra cf8ffa3a7a Force trust task on crypto dispatcher to use cached realm from crypto store 2020-02-26 11:49:08 +01:00
Benoit Marty 40b4db4a64
Merge pull request #1060 from vector-im/feature/data_class_cleanup
Data class cleanup
2020-02-26 10:57:10 +01:00
Benoit Marty 67180fd8db New direct chat: selecting several participants was not adding the room to the direct chats list 2020-02-26 07:38:10 +01:00
Benoit Marty fc95bf4926 Improve CreateRoomParams API: update some API for better chaining of builder like methods (#1070) 2020-02-26 07:32:22 +01:00
Benoit Marty e73f138151 Improve CreateRoomParams API: update Javadoc and ensure the return values will not be discarded (#1070) 2020-02-26 07:17:25 +01:00
Benoit Marty b95dfa4473 Create getBestName method for User 2020-02-25 18:14:02 +01:00
Benoit Marty 17e028178e Code robustness (avoid using !!) 2020-02-25 11:20:11 +01:00
ganfra 19b9617a09 Invite: fix inviterId being overrided 2020-02-25 10:53:47 +01:00
Benoit Marty b9b921a4df Code quality 2020-02-25 09:53:17 +01:00
ganfra 483256093a Invite: fix room member not saved 2020-02-24 18:27:18 +01:00
Benoit Marty 9c566b19f7 Ensure all eventId start with `$`, even ids for local echo 2020-02-24 17:35:43 +01:00
ganfra 8b0305c91d Clean code 2020-02-24 17:33:40 +01:00
ganfra 981c9ac4ac Invite sync: assign eventId and remove the primaryKey constraint 2020-02-24 17:33:40 +01:00
Benoit Marty c6b3b1e648 Fix bug on test 2020-02-24 17:27:04 +01:00
Benoit Marty 96af1957f9 Fix bug on progress step, found by integration test testBackupWithPassword() 2020-02-24 16:27:58 +01:00
Benoit Marty b680e24938 Fix some tests 2020-02-24 16:16:37 +01:00
Benoit Marty b3c8b5526d Each session now have it's proper crypto store 2020-02-24 15:03:12 +01:00
Benoit Marty 1e44e77503 Make code robust to int received instead of boolean
https://github.com/matrix-org/synapse/issues/6977
2020-02-24 14:42:47 +01:00
Benoit Marty b03b6bfc37 Fix crash discovered thanks to integration tests 2020-02-24 12:53:18 +01:00
Benoit Marty 1a6d4d0b03 Try to fix XSigningTest 2020-02-21 19:20:40 +01:00
Benoit Marty 1b763fb4c8 Cleanup XSigningTest 2020-02-21 18:52:36 +01:00
Benoit Marty 9ef267cb07 Cleanup after each test 2020-02-21 18:36:13 +01:00
Benoit Marty d167ff9496 Make KeysBackup test pass (still work to do) 2020-02-21 17:58:04 +01:00
Benoit Marty ccfa59ad31 Cleanup var -> val 2020-02-21 15:05:48 +01:00
Benoit Marty d6434654e2
Merge pull request #1043 from vector-im/feature/join_federation
Fix join room over federation
2020-02-21 10:08:05 +01:00
Benoit Marty b6372df676
Merge pull request #1037 from vector-im/feature/crosssigning_qr
Migrate to binary QR code verification (#994)
2020-02-21 10:01:49 +01:00
Benoit Marty d7de072155 typo 2020-02-21 09:58:56 +01:00
Benoit Marty a9909b37ba Update after Valere's review 2020-02-20 19:54:35 +01:00
Benoit Marty b72698d63c Fix another issue when there is no name and no canonical alias on a public room 2020-02-20 18:47:07 +01:00
Benoit Marty eec65fb622 Join room by roomId or room alias 2020-02-20 18:17:57 +01:00
Benoit Marty 87021dd6ec Rename field 2020-02-20 18:16:10 +01:00
Benoit Marty b85c76b172 Simplify code 2020-02-20 18:05:53 +01:00
Benoit Marty d867b1345f Format 2020-02-20 15:15:38 +01:00
onurays 7d232527c8 Documentation of the API change is added. 2020-02-20 16:39:48 +03:00
Benoit Marty e61d563589 Split long lines 2020-02-20 10:16:09 +01:00
Benoit Marty 74175ddfa0 Add a test and create extension for Byte to avoid using UByte (still experimental) 2020-02-20 10:12:07 +01:00
Benoit Marty 382fc6f05c Fix issue with long transactionId 2020-02-19 18:59:39 +01:00
Benoit Marty e81439d57b Remove v2 suffix 2020-02-19 18:09:33 +01:00
Benoit Marty f81eb298cb Cleanup QRCode v1 2020-02-19 18:06:51 +01:00
Benoit Marty 859b9e4f8e Migrate to QrCode v2 - TODO: cleanup 2020-02-19 17:50:30 +01:00
Benoit Marty e00d3ef63d QrCodeV2 WIP (al tests passing) 2020-02-19 17:34:07 +01:00
onurays a97971dd84 Fix threading issues while restoring keys backup. 2020-02-19 18:30:12 +03:00
Benoit Marty 66a2958c39 Add unit test to check byte array to string conversion 2020-02-19 14:21:41 +01:00
Benoit Marty c6b231c0b1 Create toState() fun and use the enum 2020-02-18 14:12:50 +01:00
Benoit Marty 53410789c0 Cleanup 2020-02-18 14:12:50 +01:00
Benoit Marty 7133d513b4 Fix crash in the room directory, when public room has no name (#1023) 2020-02-18 10:45:14 +01:00
Benoit Marty ebda12dd76
Merge branch 'develop' into feature/attachment_process 2020-02-17 19:22:50 +01:00
Benoit Marty adc545a93d
Merge pull request #1026 from vector-im/feature/crypto_service_renaming
Feature/crypto service renaming
2020-02-17 19:21:02 +01:00
Benoit Marty 67ed86fee5 Rename KeysBackup to DefaultKeysBackupService 2020-02-17 18:51:06 +01:00
Benoit Marty 141c7d6af0 Update comment 2020-02-17 18:43:04 +01:00
Benoit Marty f2f94c4a93 Reduce code duplication 2020-02-17 17:56:11 +01:00
Benoit Marty 4995c14f69 Add log 2020-02-17 17:46:15 +01:00
ganfra 91cbcebf73 Make test compile 2020-02-17 15:50:42 +01:00
ganfra fd0dceb597 Clean code 2020-02-17 15:23:24 +01:00
Benoit Marty 13d3aa9ff1
Merge branch 'develop' into feature/attachment_process 2020-02-17 13:48:21 +01:00
ganfra e349a35419 Crypto: expose cryptoService by a getter, removing the session implementation delegation 2020-02-16 15:40:31 +01:00
Benoit Marty a61f508b5d Fix a nice bug 2020-02-14 22:00:36 +01:00
Benoit Marty 76085a4284 AccountData cleanup and Javadoc 2020-02-14 21:50:37 +01:00
Benoit Marty 446d826dd3 Create tag interface AccountDataContent 2020-02-14 20:53:45 +01:00
Benoit Marty 2d6f57e214 More cleanup/code lisibility 2020-02-14 20:50:21 +01:00
Ganard a305ce302e Coroutine sequencer: use semaphore 2020-02-14 19:37:51 +01:00
Benoit Marty 7ddea99fc6 Move and improve withOlmDecryption() and withOlmEncryption() 2020-02-14 18:51:27 +01:00
Benoit Marty 4c3b754de4 Use const from DefaultSharedSecretStorageService 2020-02-14 18:33:15 +01:00
Benoit Marty 7878da25b8 Use doSync<>() to reduce boilerplate and add test checks
and more cleanup
2020-02-14 18:18:20 +01:00
Benoit Marty 01597a89dc Avoid code duplication 2020-02-14 17:53:27 +01:00
Benoit Marty db19ab0531
Merge branch 'develop' into feature/4s_msc1946 2020-02-14 17:45:44 +01:00
Benoit Marty cad818c341 ktlint 2020-02-14 17:05:14 +01:00
Benoit Marty 88b8ceaeb5
Merge pull request #1005 from vector-im/feature/fix_event_redaction_prompt
Do not ask for a reason if user wants to delete his own message.
2020-02-14 14:36:01 +01:00
onurays 030d6824e3 Code review fixes. 2020-02-14 15:04:25 +03:00
Valere 35835be03e klint 2020-02-14 12:06:07 +01:00
Valere f99eca8014 Code review 2020-02-14 10:48:18 +01:00
Valere e0eede1150 cleaning 2020-02-14 10:48:18 +01:00
Valere 64647cb465 Fix / Save account data after update (local echo) 2020-02-14 10:48:18 +01:00
Valere def01cca8f Fix test + changes 2020-02-14 10:48:18 +01:00
Valere 108ebea84e SSSS service + test 2020-02-14 10:48:18 +01:00
Valere bf06b57bad Refactor Account Data
Auto stash before rebase of "develop"
2020-02-14 10:48:18 +01:00
Valere a250a895fe Remove redudant calls to eventBus post 2020-02-14 10:47:34 +01:00
Benoit Marty 6c0bddc893 Code quality 2020-02-13 23:20:35 +01:00
Benoit Marty b66b96899e Better Kotlin code 2020-02-13 22:56:11 +01:00
Benoit Marty e6bd09859f Compress image before sending 2020-02-13 22:50:55 +01:00
Benoit Marty 06ba478232 Send files to several rooms at a time 2020-02-13 20:10:59 +01:00
Benoit Marty 81de914360 Propose to edit media before sending, when coming form another application 2020-02-13 20:10:59 +01:00
Ganard b7a7aa2f15 Attachment: continue working on preview screen 2020-02-13 19:52:11 +01:00
Benoit Marty d21604b791
Merge pull request #989 from vector-im/feature/qr_code_mistake
Fix issue with verification when other client declares it can only show QR code (#988)
2020-02-13 19:41:10 +01:00
Valere 1941862499 Fix / Remove debug code line 2020-02-13 15:50:08 +01:00
Benoit Marty f2e6900cfb Move throw line 2020-02-13 07:44:54 +01:00
Benoit Marty 0b7e757f3c Code lisibility: use generic name for parameters in Dagger modules 2020-02-13 07:12:11 +01:00
Benoit Marty 5b2c947af1 Rename internal class 2020-02-13 07:05:46 +01:00
Benoit Marty 6a69c6356d PushersService.pushers() has been renamed to PushersService.getPushers() 2020-02-13 07:04:54 +01:00
Benoit Marty e492e4318b Do some parameter checks 2020-02-13 06:48:52 +01:00
Benoit Marty 93d38843c3 Add Javadoc 2020-02-13 06:36:21 +01:00
Valere 21bac0f867 Fix / typo in poll 2020-02-12 22:31:13 +01:00
Valere 32c4ad9ecb Use vendor prefix for non merged MSC 2020-02-12 19:09:23 +01:00
Valere e91c6c216d code quality 2020-02-12 17:03:21 +01:00
Benoit Marty 47f47e40c4 code review and cleanup 2020-02-12 15:09:38 +01:00
Benoit Marty 9016688aec Fix compilation issue after rebase 2020-02-12 13:48:08 +01:00
Valere d5f8a0c0fc code quality 2020-02-12 13:40:54 +01:00
Valere 9a7bd35ddc Add m.buttons support (a.k.a bot buttons) 2020-02-12 13:40:54 +01:00
Valere c4ea2507f8 Add command to send poll 2020-02-12 13:39:30 +01:00
Valere 6001ac60ab klint cleaning 2020-02-12 13:37:16 +01:00
Valere 3dae220501 Fix / filter edits and poll response form lastPreviewableMessage 2020-02-12 13:37:16 +01:00
Valere 577c5a16b3 Support incremental poll response aggregation + display 2020-02-12 12:47:28 +01:00
Valere a0aebed3f7 Message Poll UX, and model 2020-02-12 12:42:17 +01:00
Benoit Marty 3a044bd655 Add Javadoc 2020-02-12 11:39:36 +01:00
Benoit Marty 6acfab3242 Rename VerificationListener to Listener 2020-02-12 11:39:36 +01:00
Benoit Marty bf02746d87 Clenaup VerificationService.VerificationListener 2020-02-12 11:39:36 +01:00
Benoit Marty 377d944228 Cleanup API 2020-02-12 11:39:36 +01:00
Benoit Marty 6ff974b3ea Fix issue with verification when other client declares it can only show QR code (#988) 2020-02-12 11:39:36 +01:00
Benoit Marty 2e7fa23ce7 Fix #980 2020-02-10 19:13:35 +01:00
Benoit Marty dd13b6bd99 Add test for DisplayName condition (passing) 2020-02-07 15:44:46 +01:00
Benoit Marty 9df699db59 Reorder tests 2020-02-07 15:35:09 +01:00
Benoit Marty 8bdb2b88fd make the test compile 2020-02-07 15:32:36 +01:00
Benoit Marty 2a534b5874 Handle SenderNotificationPermissionCondition 2020-02-07 15:32:20 +01:00
Benoit Marty f719da96ed Rename Condition.Kind enum values and add some documentation 2020-02-07 15:02:39 +01:00
Benoit Marty 31e5c0eb1a Improve algorithm 2020-02-07 14:48:08 +01:00
Benoit Marty 34c5f37bbc findAll() does not return null value 2020-02-07 14:30:44 +01:00
Benoit Marty 9aadbbc3c7 Rework DefaultConditionResolver, and create RoomGetter 2020-02-07 14:27:24 +01:00
Benoit Marty 5fedfd9286 Cleanup 2020-02-06 16:00:05 +01:00
Valere 1917fbcc93 eventBus private 2020-02-06 13:56:57 +01:00
Valere a48bf61ad7 quick dispatch to correct thread (will need more work) 2020-02-06 13:56:57 +01:00
Valere 5c1fcc47a1 Catch all decryption fails in mapping 2020-02-06 13:56:57 +01:00
Valere d80c15f52f Dispatch init on crypto thread to avoid blocking cold start 2020-02-06 13:56:57 +01:00
Valere 911ff8cf16 cleaning (klint) 2020-02-06 13:56:57 +01:00
Valere 320dc4accd Refactor Room Shield / Profile shield 2020-02-06 13:56:57 +01:00
Benoit Marty 51c2b9e1e9 Import strings from Riot 2020-02-05 17:35:23 +01:00
Benoit Marty dcd7d17ffd Fix compilation issue after merge and update CHANGES.md 2020-02-05 14:13:43 +01:00
Benoit Marty d9c007d017 Merge branch 'develop' into feature/stabilization_2 2020-02-05 12:57:42 +01:00
Benoit Marty 05dd587fa8 Move FORMAT_MATRIX_HTML to a proper object and so fix a wrong usage issue 2020-02-05 12:44:31 +01:00
Benoit Marty 3384d91adb Rename MessageContent.type to MessageContent.msgType for code clarity and update a few the Javadoc 2020-02-05 12:39:26 +01:00
Benoit Marty a3ec0e03a0 Use NoOpMatrixCallback when it's possible 2020-02-05 12:05:12 +01:00
Benoit Marty 47ee2a24a7 Move NoOpMatrixCallback to MatrixCallback.kt file 2020-02-05 11:58:08 +01:00
Benoit Marty a17ec14dd7 Cleanup and little change on Throwable logging 2020-02-05 11:39:23 +01:00
Benoit Marty f7d511df38 Ganfra's review 2020-02-04 17:48:17 +01:00
Benoit Marty 6bff951c72 Keep MXCryptoConfig, but do a correct usage of it 2020-02-04 15:37:46 +01:00
Benoit Marty bd033866a8 Encrypt for invited users by default, if the room state allows it (#803) 2020-02-04 14:41:32 +01:00
Benoit Marty 3e9b2e4a06 Use the correct enableEncryption() method 2020-02-04 14:04:48 +01:00
Ganard ed9c3379bf Rename file 2020-02-04 13:50:10 +01:00
Ganard 1728d31401 Fix some issues and make test passes 2020-02-04 13:19:02 +01:00
Benoit Marty 225a6e00e6 Add doc and reorder 2020-02-04 12:10:51 +01:00
Benoit Marty 4335fa4f72 ktlint 2020-02-03 16:26:18 +01:00
Ganard f454078c6b Clean code 2020-02-03 16:14:36 +01:00
Ganard 88755a79b4 In memory sending: fix broken filtering 2020-02-03 15:18:19 +01:00
Ganard e6cd8a3a86 Merge develop into feature/stabilization_2 2020-02-03 13:59:20 +01:00
Valere b182a63ea1 fix concurrent co mofification 2020-02-02 15:28:00 +01:00
Valere 367057cc29 Fix / cold start 2020-02-02 14:01:45 +01:00
Valere 96a556f449 Fix / Race causing key requests to be sent to early in xsigning 2020-02-02 01:21:08 +01:00
Valere fb838e5407 Fixes #813 2020-02-01 23:24:05 +01:00
Valere 245b3717b9 Send done in toDevice 2020-02-01 18:25:31 +01:00
Benoit Marty cd606ba8a1 RoomMember decoration 2020-02-01 11:37:16 +01:00
Valere fc4f5faffd Update Room decoration algo 2020-02-01 10:21:29 +01:00
Benoit Marty f2f775cb99 Add TODOs 2020-02-01 01:17:18 +01:00
Benoit Marty ccd4c1ed86 ktlint 2020-01-31 20:46:33 +01:00
Benoit Marty c3c88c387b Improve Rx chain and cleanup 2020-01-31 19:55:22 +01:00
Valere 51e0f945a7 Quick Room Decoration 2020-01-31 18:52:33 +01:00
Ganard 37230b0614 Fix issues with read marker and jumpToBottom 2020-01-31 18:09:34 +01:00
Ganard ec6d78bf96 Merge branch 'develop' into feature/stabilization_2 2020-01-31 15:47:33 +01:00
Ganard 759b680e63 Timeline/Sync: Fix some issues 2020-01-31 15:28:35 +01:00
Benoit Marty f5ecf4bd90 Room decoration - UI 2020-01-31 15:02:54 +01:00
Benoit Marty 4d91bc934b Fix ktlint 2020-01-31 14:12:03 +01:00
Valere 5c547794f2 Merge branch 'develop' into cross_signing 2020-01-31 14:09:40 +01:00
Benoit Marty 43358cd86c Make self verification work! 2020-01-31 12:18:27 +01:00
Benoit Marty 80f4f95f81 QRCode: requestId is not supposed to be an eventId 2020-01-31 11:11:27 +01:00
Valere 4fb59aadb1 Fix / ensure RoomKeyRequest are made after device is verified 2020-01-31 09:39:31 +01:00
Benoit Marty 9dde43f65b PR Review: var -> val, internal and other cleanup 2020-01-30 23:40:25 +01:00
Benoit Marty ccd857016c ktlint 2020-01-30 18:46:08 +01:00
Benoit Marty 225e4e0433 To Device Verification Request 2020-01-30 18:43:50 +01:00
Ganard 5e1b59f9d3 Timeline: handle an in memory local echo to make the UI snappier 2020-01-30 17:13:44 +01:00
Benoit Marty fb98d6ef42 QRCode: add other_device_key field and make it optional, along with other_user_key 2020-01-30 16:46:12 +01:00
Benoit Marty 6282f81bc4 Remove typo 2020-01-30 16:46:12 +01:00