flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Use the same ownCloudClient across the whole login process

Browse Source
This commit is contained in:
Abel García de Prada 2020-11-19 19:05:48 +01:00
parent 18b271665d
commit 0fc3f7668d
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/ServerInfoService.kt
View File

@ -23,11 +23,12 @@
*/ */
package com.owncloud.android.lib.resources.status.services 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.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.status.OwnCloudVersion import com.owncloud.android.lib.resources.status.OwnCloudVersion
interface ServerInfoService { 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>
} }

24
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt
View File

@ -19,26 +19,28 @@
package com.owncloud.android.lib.resources.status.services.implementation 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.OwnCloudClient
import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.getAnonymousCredentials
import com.owncloud.android.lib.common.operations.RemoteOperationResult 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.files.CheckPathExistenceRemoteOperation
import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation
import com.owncloud.android.lib.resources.status.OwnCloudVersion import com.owncloud.android.lib.resources.status.OwnCloudVersion
import com.owncloud.android.lib.resources.status.services.ServerInfoService
class OCServerInfoService : 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( CheckPathExistenceRemoteOperation(
remotePath = path, remotePath = path,
isUserLogged = true isUserLogged = true
).execute(createClientFromPath(path)) ).execute(client)
override fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion> = override fun getRemoteStatus(
GetRemoteStatusOperation().execute(createClientFromPath(path)) path: String,
client: OwnCloudClient
private fun createClientFromPath(path: String): OwnCloudClient { ): RemoteOperationResult<OwnCloudVersion> =
return OwnCloudClient(Uri.parse(path)).apply { credentials = getAnonymousCredentials() } GetRemoteStatusOperation().execute(client)
}
} }