gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to new current user provider

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-23 16:33:45 +02:00
parent f3d31bf8c1
commit 1a20bd3a3b
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt
View File

@ -41,7 +41,7 @@ import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite
import com.nextcloud.talk.components.filebrowser.models.properties.OCId import com.nextcloud.talk.components.filebrowser.models.properties.OCId
import com.nextcloud.talk.components.filebrowser.models.properties.OCSize import com.nextcloud.talk.components.filebrowser.models.properties.OCSize
import com.nextcloud.talk.dagger.modules.RestModule.MagicAuthenticator import com.nextcloud.talk.dagger.modules.RestModule.MagicAuthenticator
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.Mimetype.FOLDER import com.nextcloud.talk.utils.Mimetype.FOLDER
@ -50,7 +50,7 @@ import okhttp3.OkHttpClient
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: UserEntity, path: String, depth: Int) { class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: User, path: String, depth: Int) {
private val okHttpClient: OkHttpClient private val okHttpClient: OkHttpClient
private val url: String private val url: String
private val depth: Int private val depth: Int

12
app/src/main/java/com/nextcloud/talk/remotefilebrowser/repositories/RemoteFileBrowserItemsRepositoryImpl.kt
View File

@ -21,20 +21,20 @@
package com.nextcloud.talk.remotefilebrowser.repositories package com.nextcloud.talk.remotefilebrowser.repositories
import com.nextcloud.talk.components.filebrowser.webdav.ReadFolderListingOperation import com.nextcloud.talk.components.filebrowser.webdav.ReadFolderListingOperation
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem
import com.nextcloud.talk.utils.database.user.CurrentUserProvider import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
import io.reactivex.Observable import io.reactivex.Observable
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import javax.inject.Inject import javax.inject.Inject
class RemoteFileBrowserItemsRepositoryImpl @Inject constructor( class RemoteFileBrowserItemsRepositoryImpl @Inject constructor(
private val okHttpClient: OkHttpClient, private val okHttpClient: OkHttpClient,
private val userProvider: CurrentUserProvider private val userProvider: CurrentUserProviderNew
) : RemoteFileBrowserItemsRepository { ) : RemoteFileBrowserItemsRepository {
private val userEntity: UserEntity private val user: User
get() = userProvider.currentUser!! get() = userProvider.currentUser.blockingGet()
override fun listFolder(path: String): override fun listFolder(path: String):
Observable<List<RemoteFileBrowserItem>> { Observable<List<RemoteFileBrowserItem>> {
@ -42,7 +42,7 @@ class RemoteFileBrowserItemsRepositoryImpl @Inject constructor(
val operation = val operation =
ReadFolderListingOperation( ReadFolderListingOperation(
okHttpClient, okHttpClient,
userEntity, user,
path, path,
1 1
) )