From d4b84635f18dd7741b52038fd9107f894c6fba68 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 23 Jul 2022 14:32:43 +0200 Subject: [PATCH] Migrate DownloadFileToCacheWorker from requery to room Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/jobs/DownloadFileToCacheWorker.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/DownloadFileToCacheWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/DownloadFileToCacheWorker.kt index ee1863730..e0ecd4888 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/DownloadFileToCacheWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/DownloadFileToCacheWorker.kt @@ -1,7 +1,9 @@ /* * Nextcloud Talk application * + * @author Andy Scherzinger * @author Marcel Hibbe + * Copyright (C) 2022 Andy Scherzinger * Copyright (C) 2021 Marcel Hibbe * * This program is free software: you can redistribute it and/or modify @@ -28,9 +30,9 @@ import androidx.work.WorkerParameters import autodagger.AutoInjector import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.models.database.UserEntity +import com.nextcloud.talk.data.user.model.User +import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.preferences.AppPreferences import okhttp3.ResponseBody import java.io.BufferedInputStream @@ -50,7 +52,7 @@ class DownloadFileToCacheWorker(val context: Context, workerParameters: WorkerPa lateinit var ncApi: NcApi @Inject - lateinit var userUtils: UserUtils + lateinit var userManager: UserManager @Inject lateinit var appPreferences: AppPreferences @@ -63,7 +65,7 @@ class DownloadFileToCacheWorker(val context: Context, workerParameters: WorkerPa } try { - val currentUser = userUtils.currentUser + val currentUser = userManager.currentUser.blockingGet() val baseUrl = inputData.getString(KEY_BASE_URL) val userId = inputData.getString(KEY_USER_ID) val attachmentFolder = inputData.getString(KEY_ATTACHMENT_FOLDER) @@ -87,7 +89,7 @@ class DownloadFileToCacheWorker(val context: Context, workerParameters: WorkerPa } } - private fun downloadFile(currentUser: UserEntity, url: String, fileName: String): Result { + private fun downloadFile(currentUser: User, url: String, fileName: String): Result { val downloadCall = ncApi.downloadFile( ApiUtils.getCredentials(currentUser.username, currentUser.token), url