rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reducing argument number in session info view update method

Browse Source
This commit is contained in:
Maxime NATUREL 2022-09-19 11:29:39 +02:00
parent 72637b465f
commit 943ec7ee75
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
View File

@ -35,7 +35,6 @@ import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.DrawableProvider import im.vector.app.core.resources.DrawableProvider
import im.vector.app.databinding.FragmentSessionOverviewBinding import im.vector.app.databinding.FragmentSessionOverviewBinding
import im.vector.app.features.crypto.recover.SetupMode import im.vector.app.features.crypto.recover.SetupMode
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
import javax.inject.Inject import javax.inject.Inject
@ -107,11 +106,7 @@ class SessionOverviewFragment :
override fun invalidate() = withState(viewModel) { state -> override fun invalidate() = withState(viewModel) { state ->
updateToolbar(state.isCurrentSession) updateToolbar(state.isCurrentSession)
updateEntryDetails(state.deviceId) updateEntryDetails(state.deviceId)
if (state.deviceInfo is Success) { updateSessionInfo(state)
renderSessionInfo(state.isCurrentSession, state.deviceInfo.invoke(), state.isCurrentSessionTrusted)
} else {
hideSessionInfo()
}
} }
private fun updateToolbar(isCurrentSession: Boolean) { private fun updateToolbar(isCurrentSession: Boolean) {
@ -127,21 +122,22 @@ class SessionOverviewFragment :
} }
} }
private fun renderSessionInfo( private fun updateSessionInfo(viewState: SessionOverviewViewState) {
isCurrentSession: Boolean, if (viewState.deviceInfo is Success) {
deviceFullInfo: DeviceFullInfo, views.sessionOverviewInfo.isVisible = true
isCurrentSessionTrusted: Boolean, val isCurrentSession = viewState.isCurrentSession
) { val infoViewState = SessionInfoViewState(
views.sessionOverviewInfo.isVisible = true isCurrentSession = isCurrentSession,
val viewState = SessionInfoViewState( deviceFullInfo = viewState.deviceInfo.invoke(),
isCurrentSession = isCurrentSession, isVerifyButtonVisible = isCurrentSession || viewState.isCurrentSessionTrusted,
deviceFullInfo = deviceFullInfo, isDetailsButtonVisible = false,
isVerifyButtonVisible = isCurrentSession || isCurrentSessionTrusted, isLearnMoreLinkVisible = true,
isDetailsButtonVisible = false, isLastSeenDetailsVisible = true,
isLearnMoreLinkVisible = true, )
isLastSeenDetailsVisible = true, views.sessionOverviewInfo.render(infoViewState, dateFormatter, drawableProvider, colorProvider)
) } else {
views.sessionOverviewInfo.render(viewState, dateFormatter, drawableProvider, colorProvider) hideSessionInfo()
}
} }
private fun hideSessionInfo() { private fun hideSessionInfo() {