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
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
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
ganfra
458e3ee5e8
Timeline: fetch next token with the help of getContext when required
2020-05-15 20:18:07 +02:00
Benoit Marty
8eebcef4e9
Fix #1373
2020-05-15 15:36:52 +02: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
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
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
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
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
53583c691f
Add some logs
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
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
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
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
ganfra
43055964ba
Crypto store : avoid copying before mapping to other data
2020-04-28 16:26:04 +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
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
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
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
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
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
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
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
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
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