filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fun RawService.getElementWellknown() now takes a SessionParams for parameter to be able to use something else than the userId's domain

Browse Source
This commit is contained in:
Benoit Marty 2021-06-30 09:27:11 +02:00
parent 984b1dd6a8
commit 0f25e2986f
9 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
View File

@ -56,7 +56,7 @@ class JitsiService @Inject constructor(
// Build data for a jitsi widget // Build data for a jitsi widget
val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + System.currentTimeMillis() val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + System.currentTimeMillis()
val preferredJitsiDomain = tryOrNull { val preferredJitsiDomain = tryOrNull {
rawService.getElementWellknown(session.myUserId) rawService.getElementWellknown(session.sessionParams)
?.jitsiServer ?.jitsiServer
?.preferredDomain ?.preferredDomain
} }

2
vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
View File

@ -86,7 +86,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
setState { copy(createAndInviteState = Loading()) } setState { copy(createAndInviteState = Loading()) }
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val adminE2EByDefault = rawService.getElementWellknown(session.myUserId) val adminE2EByDefault = rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true

2
vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
View File

@ -35,7 +35,7 @@ class DirectRoomHelper @Inject constructor(
if (existingRoomId != null) { if (existingRoomId != null) {
roomId = existingRoomId roomId = existingRoomId
} else { } else {
val adminE2EByDefault = rawService.getElementWellknown(session.myUserId) val adminE2EByDefault = rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true

2
vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
View File

@ -70,7 +70,7 @@ class HomeServerCapabilitiesViewModel @AssistedInject constructor(
private fun initAdminE2eByDefault() { private fun initAdminE2eByDefault() {
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val adminE2EByDefault = tryOrNull { val adminE2EByDefault = tryOrNull {
rawService.getElementWellknown(session.myUserId) rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true
} ?: true } ?: true

7
vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
View File

@ -16,11 +16,14 @@
package im.vector.app.features.raw.wellknown package im.vector.app.features.raw.wellknown
import org.matrix.android.sdk.api.auth.data.SessionParams
import org.matrix.android.sdk.api.extensions.tryOrNull import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.raw.RawService import org.matrix.android.sdk.api.raw.RawService
suspend fun RawService.getElementWellknown(userId: String): ElementWellKnown? { suspend fun RawService.getElementWellknown(sessionParams: SessionParams): ElementWellKnown? {
return tryOrNull { getWellknown(userId) } // By default we use the domain of the userId to retrieve the .well-known data
val domain = sessionParams.userId.substringAfter(":")
return tryOrNull { getWellknown(domain) }
?.let { ElementWellKnownMapper.from(it) } ?.let { ElementWellKnownMapper.from(it) }
} }

2
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
View File

@ -72,7 +72,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init
private fun initAdminE2eByDefault() { private fun initAdminE2eByDefault() {
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
adminE2EByDefault = tryOrNull { adminE2EByDefault = tryOrNull {
rawService.getElementWellknown(session.myUserId) rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true
} ?: true } ?: true

2
vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View File

@ -157,7 +157,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
findPreference<VectorPreference>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT)?.isVisible = findPreference<VectorPreference>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT)?.isVisible =
vectorActivity.getVectorComponent() vectorActivity.getVectorComponent()
.rawService() .rawService()
.getElementWellknown(session.myUserId) .getElementWellknown(session.sessionParams)
?.isE2EByDefault() == false ?.isE2EByDefault() == false
} }
} }

2
vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
View File

@ -75,7 +75,7 @@ class CreateSpaceViewModelTask @Inject constructor(
val childIds = mutableListOf<String>() val childIds = mutableListOf<String>()
val e2eByDefault = tryOrNull { val e2eByDefault = tryOrNull {
rawService.getElementWellknown(session.myUserId) rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true
} ?: true } ?: true

2
vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
View File

@ -81,7 +81,7 @@ class SpacePeopleViewModel @AssistedInject constructor(
setState { copy(createAndInviteState = Loading()) } setState { copy(createAndInviteState = Loading()) }
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val adminE2EByDefault = rawService.getElementWellknown(session.myUserId) val adminE2EByDefault = rawService.getElementWellknown(session.sessionParams)
?.isE2EByDefault() ?.isE2EByDefault()
?: true ?: true