Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatically give user consent to identity server policy #293

Merged
merged 1 commit into from
Dec 7, 2021
Merged

Automatically give user consent to identity server policy #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,17 @@ class HomeActivityViewModel @AssistedInject constructor(

private fun updateIdentityServer(session: Session) {
viewModelScope.launch {
val currentIdentityServerUrl = tryOrNull {
session.identityService().getCurrentIdentityServerUrl()
}

if (currentIdentityServerUrl == null) {
val identityServerUrl = session.sessionParams.homeServerUrl
with(session.identityService()) {
if (getCurrentIdentityServerUrl() == null) {
setNewIdentityServer(session.sessionParams.homeServerUrl)
Timber.d("## updateIdentityServer succeeded (${getCurrentIdentityServerUrl()})")
}

session.identityService().setNewIdentityServer(identityServerUrl)
Timber.d("## updateIdentityServer succeeded ($identityServerUrl)")
// Tchap: Force user consent as it should have been already accepted in TAC
if (!getUserConsent()) {
setUserConsent(true)
Timber.d("## updateIdentityServer user consent succeeded")
}
}
}
}
Expand Down