Support entering mail in user invite screen #4051
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BillCarsonFr
force-pushed
the
feature/bca/invite_user_by_mail
branch
from
a567eb0
to
308ae7c
Compare
ouchadam
reviewed
Sep 21, 2021
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
Outdated
Show resolved
Hide resolved
ouchadam
reviewed
Sep 21, 2021
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
Show resolved
Hide resolved
ouchadam
reviewed
Sep 21, 2021
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
Outdated
Show resolved
Hide resolved
BillCarsonFr
added
the
Z-NextRelease
bmarty
requested changes
Sep 23, 2021
...oid/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/userdirectory/FoundThreePidItem.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
Outdated
Show resolved
Hide resolved
BillCarsonFr
force-pushed
the
feature/bca/invite_user_by_mail
branch
from
47e3945
to
0acf90d
Compare
bmarty
reviewed
Sep 24, 2021
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
Outdated
Show resolved
Hide resolved
bmarty
reviewed
Sep 24, 2021
| @@ -202,6 +202,8 @@ internal class DefaultIdentityService @Inject constructor( | |||
|
|
|||
| identityStore.setUrl(urlCandidate) | |||
| identityStore.setToken(token) | |||
| // could we remember if it was previously given? | |||
| identityStore.setUserConsent(false) | |||
There was a problem hiding this comment.
This line is not necessary, the line 203 already erase all the existing data, including the consent
bmarty
reviewed
Sep 24, 2021
| @@ -202,6 +202,8 @@ internal class DefaultIdentityService @Inject constructor( | |||
|
|
|||
| identityStore.setUrl(urlCandidate) | |||
| identityStore.setToken(token) | |||
| // could we remember if it was previously given? | |||
There was a problem hiding this comment.
For now we keep only one IdentityDataEntity, but yes, why not change that in the future
bmarty
reviewed
Sep 24, 2021
| @@ -65,7 +65,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor( | |||
| setState { | |||
| copy( | |||
| identityServer = Success(identityServerUrl), | |||
| userConsent = false | |||
| userConsent = identityService.getUserConsent() | |||
There was a problem hiding this comment.
so I think this change is not necessary anymore
bmarty
approved these changes
Sep 24, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support to invite by mail from the user invite dialog.
If the search term is an email, then the app will try to lookup this email from the configured identity server. If a match is found the result will appear with some profile information, if no match it is still possible to tap the raw email and send the invite.
For now only email 3pid is supported (not phone numbers)
If there is no Identity Server the user will see a call to action to set it up
If the Identity server is setup but user didn't consent to use it, then a dedicated call to action is added:
Fixes #4042