From 0fc3f7668ddce2af276b0538b80616f03c33f92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Thu, 19 Nov 2020 19:05:48 +0100
Subject: [PATCH] Use the same ownCloudClient across the whole login process

---
 .../status/services/ServerInfoService.kt      |  5 ++--
 .../implementation/OCServerInfoService.kt     | 24 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/ServerInfoService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/ServerInfoService.kt
index 1efa7f1b..121f617f 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/ServerInfoService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/ServerInfoService.kt
@@ -23,11 +23,12 @@
  */
 package com.owncloud.android.lib.resources.status.services
 
+import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 
 interface ServerInfoService {
-    fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
+    fun checkPathExistence(path: String, isUserLogged: Boolean, client: OwnCloudClient): RemoteOperationResult<Boolean>
 
-    fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion>
+    fun getRemoteStatus(path: String, client: OwnCloudClient): RemoteOperationResult<OwnCloudVersion>
 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt
index 76f82a46..65b85479 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt
@@ -19,26 +19,28 @@
 
 package com.owncloud.android.lib.resources.status.services.implementation
 
-import android.net.Uri
 import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.getAnonymousCredentials
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.status.services.ServerInfoService
 import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation
 import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import com.owncloud.android.lib.resources.status.services.ServerInfoService
 
 class OCServerInfoService : ServerInfoService {
-    override fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean> =
+
+    override fun checkPathExistence(
+        path: String,
+        isUserLogged: Boolean,
+        client: OwnCloudClient
+    ): RemoteOperationResult<Boolean> =
         CheckPathExistenceRemoteOperation(
             remotePath = path,
             isUserLogged = true
-        ).execute(createClientFromPath(path))
+        ).execute(client)
 
-    override fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion> =
-        GetRemoteStatusOperation().execute(createClientFromPath(path))
-
-    private fun createClientFromPath(path: String): OwnCloudClient {
-        return OwnCloudClient(Uri.parse(path)).apply { credentials = getAnonymousCredentials() }
-    }
+    override fun getRemoteStatus(
+        path: String,
+        client: OwnCloudClient
+    ): RemoteOperationResult<OwnCloudVersion> =
+        GetRemoteStatusOperation().execute(client)
 }