From a891f59397b3a20a9f385b3407b7ddf08487ab87 Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Thu, 10 Mar 2022 12:02:25 +0100 Subject: [PATCH] Replaces lateinit var with passing params --- .../session/space/ResolveSpaceInfoTask.kt | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt index 47c3f199b8..735d0904d9 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt @@ -37,32 +37,31 @@ internal class DefaultResolveSpaceInfoTask @Inject constructor( private val globalErrorReceiver: GlobalErrorReceiver ) : ResolveSpaceInfoTask { - private lateinit var params: ResolveSpaceInfoTask.Params - override suspend fun execute(params: ResolveSpaceInfoTask.Params) = executeRequest(globalErrorReceiver) { - this.params = params - getSpaceHierarchy() + getSpaceHierarchy(params) } - private suspend fun getSpaceHierarchy() = try { - getStableSpaceHierarchy() + private suspend fun getSpaceHierarchy(params: ResolveSpaceInfoTask.Params) = try { + getStableSpaceHierarchy(params) } catch (e: HttpException) { - getUnstableSpaceHierarchy() + getUnstableSpaceHierarchy(params) } - private suspend fun getStableSpaceHierarchy() = + private suspend fun getStableSpaceHierarchy(params: ResolveSpaceInfoTask.Params) = spaceApi.getSpaceHierarchy( spaceId = params.spaceId, suggestedOnly = params.suggestedOnly, limit = params.limit, maxDepth = params.maxDepth, - from = params.from) + from = params.from, + ) - private suspend fun getUnstableSpaceHierarchy() = + private suspend fun getUnstableSpaceHierarchy(params: ResolveSpaceInfoTask.Params) = spaceApi.getSpaceHierarchyUnstable( spaceId = params.spaceId, suggestedOnly = params.suggestedOnly, limit = params.limit, maxDepth = params.maxDepth, - from = params.from) + from = params.from, + ) }