From 98ae9d0e8afa476da98aebe6bddb792fd4af25da Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 4 Nov 2021 18:00:42 +0100 Subject: [PATCH] Refactoring --- .../android/sdk/api/failure/Extensions.kt | 6 +-- .../matrix/android/sdk/api/session/Session.kt | 6 +-- .../ContentScannerError.kt} | 6 +-- .../ContentScannerService.kt | 2 +- .../ScanState.kt | 2 +- .../internal/auth/login/DefaultLoginWizard.kt | 2 +- .../sdk/internal/session/DefaultSession.kt | 4 +- .../sdk/internal/session/SessionComponent.kt | 2 +- .../content/DefaultContentUrlResolver.kt | 6 +-- .../ContentScannerApi.kt} | 10 ++-- .../ContentScannerApiProvider.kt} | 7 ++- .../ContentScannerModule.kt | 28 +++++------ .../DefaultContentScannerService.kt | 46 +++++++++---------- .../DisabledContentScannerService.kt | 6 +-- .../ScanEncryptorUtils.kt | 8 ++-- .../data/ContentScannerStore.kt} | 8 ++-- .../db/ContentScanResultEntity.kt | 6 +-- .../db/ContentScannerEntityQueries.kt | 2 +- .../db/ContentScannerInfoEntity.kt | 2 +- .../db/ContentScannerRealmModule.kt | 2 +- .../db/RealmContentScannerStore.kt | 10 ++-- .../model/DownloadBody.kt | 2 +- .../model/ScanResponse.kt | 2 +- .../model/ServerPublicKeyResponse.kt | 2 +- .../tasks/DownloadEncryptedTask.kt | 10 ++-- .../tasks/GetServerPublicKeyTask.kt | 10 ++-- .../tasks/ScanEncryptedTask.kt | 26 +++++------ .../tasks/ScanMediaTask.kt | 24 +++++----- 28 files changed, 123 insertions(+), 124 deletions(-) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/{contentscanning/ContentScanError.kt => contentscanner/ContentScannerError.kt} (87%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/{contentscanning => contentscanner}/ContentScannerService.kt (96%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/{contentscanning => contentscanner}/ScanState.kt (86%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning/ContentScanApi.kt => contentscanner/ContentScannerApi.kt} (75%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning/ContentScanningApiProvider.kt => contentscanner/ContentScannerApiProvider.kt} (51%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/ContentScannerModule.kt (64%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/DefaultContentScannerService.kt (72%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/DisabledContentScannerService.kt (90%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/ScanEncryptorUtils.kt (86%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning/data/ContentScanningStore.kt => contentscanner/data/ContentScannerStore.kt} (76%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/db/ContentScanResultEntity.kt (84%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/db/ContentScannerEntityQueries.kt (94%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/db/ContentScannerInfoEntity.kt (84%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/db/ContentScannerRealmModule.kt (87%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/db/RealmContentScannerStore.kt (93%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/model/DownloadBody.kt (93%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/model/ScanResponse.kt (88%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/model/ServerPublicKeyResponse.kt (84%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/tasks/DownloadEncryptedTask.kt (73%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/tasks/GetServerPublicKeyTask.kt (66%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/tasks/ScanEncryptedTask.kt (59%) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{contentscanning => contentscanner}/tasks/ScanMediaTask.kt (64%) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt index dec396ad1b..13a26c89c1 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt @@ -18,8 +18,8 @@ package org.matrix.android.sdk.api.failure import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse import org.matrix.android.sdk.api.extensions.tryOrNull -import org.matrix.android.sdk.api.session.contentscanning.ContentScanError -import org.matrix.android.sdk.api.session.contentscanning.ScanFailure +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerError +import org.matrix.android.sdk.api.session.contentscanner.ScanFailure import org.matrix.android.sdk.internal.di.MoshiProvider import java.io.IOException import javax.net.ssl.HttpsURLConnection @@ -110,7 +110,7 @@ fun Throwable.toScanFailure(): ScanFailure? { return if (this is Failure.OtherServerError) { tryOrNull { MoshiProvider.providesMoshi() - .adapter(ContentScanError::class.java) + .adapter(ContentScannerError::class.java) .fromJson(errorBody) } ?.let { ScanFailure(it, httpCode, this) } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt index 97197a3933..3f817ec4d2 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt @@ -31,7 +31,7 @@ import org.matrix.android.sdk.api.session.cache.CacheService import org.matrix.android.sdk.api.session.call.CallSignalingService import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker import org.matrix.android.sdk.api.session.content.ContentUrlResolver -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService import org.matrix.android.sdk.api.session.crypto.CryptoService import org.matrix.android.sdk.api.session.events.EventService import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker @@ -194,9 +194,9 @@ interface Session : fun cryptoService(): CryptoService /** - * Returns the ContentScanningService associated with the session + * Returns the ContentScannerService associated with the session */ - fun contentScanningService(): ContentScannerService + fun contentScannerService(): ContentScannerService /** * Returns the identity service associated with the session diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScanError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerError.kt similarity index 87% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScanError.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerError.kt index aeb4d3c287..31c512721c 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScanError.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerError.kt @@ -4,13 +4,13 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.api.session.contentscanning +package org.matrix.android.sdk.api.session.contentscanner import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class ContentScanError( +data class ContentScannerError( @Json(name = "info") val info: String? = null, @Json(name = "reason") val reason: String? = null ) { @@ -32,7 +32,7 @@ data class ContentScanError( } } -class ScanFailure(val error: ContentScanError, val httpCode: Int, cause: Throwable? = null) : Throwable(cause = cause) +class ScanFailure(val error: ContentScannerError, val httpCode: Int, cause: Throwable? = null) : Throwable(cause = cause) // For Glide, which deals with Exception and not with Throwable fun ScanFailure.toException() = Exception(this) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt similarity index 96% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScannerService.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt index 53975f3706..47e4e4296b 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ContentScannerService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.api.session.contentscanning +package org.matrix.android.sdk.api.session.contentscanner import androidx.lifecycle.LiveData import org.matrix.android.sdk.api.MatrixCallback diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ScanState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ScanState.kt similarity index 86% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ScanState.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ScanState.kt index 3371878221..578d8ca185 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanning/ScanState.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ScanState.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.api.session.contentscanning +package org.matrix.android.sdk.api.session.contentscanner enum class ScanState { TRUSTED, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt index 111d1263fb..0583951138 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt @@ -33,7 +33,7 @@ import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistration import org.matrix.android.sdk.internal.auth.registration.RegisterAddThreePidTask import org.matrix.android.sdk.internal.network.executeRequest import org.matrix.android.sdk.internal.session.content.DefaultContentUrlResolver -import org.matrix.android.sdk.internal.session.contentscanning.DisabledContentScannerService +import org.matrix.android.sdk.internal.session.contentscanner.DisabledContentScannerService internal class DefaultLoginWizard( private val authAPI: AuthAPI, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt index 7c352a8f99..f0ad0f87b0 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt @@ -35,7 +35,7 @@ import org.matrix.android.sdk.api.session.cache.CacheService import org.matrix.android.sdk.api.session.call.CallSignalingService import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker import org.matrix.android.sdk.api.session.content.ContentUrlResolver -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService import org.matrix.android.sdk.api.session.crypto.CryptoService import org.matrix.android.sdk.api.session.events.EventService import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker @@ -277,7 +277,7 @@ internal class DefaultSession @Inject constructor( override fun cryptoService(): CryptoService = cryptoService.get() - override fun contentScanningService(): ContentScannerService = contentScannerService.get() + override fun contentScannerService(): ContentScannerService = contentScannerService.get() override fun identityService() = identityService diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt index 8e6310026f..a3f8f5dc6d 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt @@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session import dagger.BindsInstance import dagger.Component -import org.matrix.android.sdk.internal.session.contentscanning.ContentScannerModule +import org.matrix.android.sdk.internal.session.contentscanner.ContentScannerModule import org.matrix.android.sdk.api.MatrixCoroutineDispatchers import org.matrix.android.sdk.api.auth.data.SessionParams import org.matrix.android.sdk.api.session.Session diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt index 4124d5c437..d710fd36c3 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt @@ -20,11 +20,11 @@ import org.matrix.android.sdk.api.MatrixUrls import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig import org.matrix.android.sdk.api.session.content.ContentUrlResolver -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.network.NetworkConstants -import org.matrix.android.sdk.internal.session.contentscanning.ScanEncryptorUtils -import org.matrix.android.sdk.internal.session.contentscanning.model.toJson +import org.matrix.android.sdk.internal.session.contentscanner.ScanEncryptorUtils +import org.matrix.android.sdk.internal.session.contentscanner.model.toJson import org.matrix.android.sdk.internal.util.ensureTrailingSlash import javax.inject.Inject diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApi.kt similarity index 75% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanApi.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApi.kt index f4ce3b440e..b7703a9a15 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanApi.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApi.kt @@ -4,13 +4,13 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import okhttp3.ResponseBody import org.matrix.android.sdk.internal.network.NetworkConstants -import org.matrix.android.sdk.internal.session.contentscanning.model.DownloadBody -import org.matrix.android.sdk.internal.session.contentscanning.model.ScanResponse -import org.matrix.android.sdk.internal.session.contentscanning.model.ServerPublicKeyResponse +import org.matrix.android.sdk.internal.session.contentscanner.model.DownloadBody +import org.matrix.android.sdk.internal.session.contentscanner.model.ScanResponse +import org.matrix.android.sdk.internal.session.contentscanner.model.ServerPublicKeyResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST @@ -19,7 +19,7 @@ import retrofit2.http.Path /** * https://github.com/matrix-org/matrix-content-scanner */ -internal interface ContentScanApi { +internal interface ContentScannerApi { @POST(NetworkConstants.URI_API_PREFIX_PATH_MEDIA_PROXY_UNSTABLE + "download_encrypted") suspend fun downloadEncrypted(@Body info: DownloadBody): ResponseBody diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanningApiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApiProvider.kt similarity index 51% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanningApiProvider.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApiProvider.kt index 3f81c04173..45f63e21d7 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScanningApiProvider.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerApiProvider.kt @@ -4,13 +4,12 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import org.matrix.android.sdk.internal.session.SessionScope -import org.matrix.android.sdk.internal.session.contentscanning.ContentScanApi import javax.inject.Inject @SessionScope -internal class ContentScanningApiProvider @Inject constructor() { - var contentScannerApi: ContentScanApi? = null +internal class ContentScannerApiProvider @Inject constructor() { + var contentScannerApi: ContentScannerApi? = null } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScannerModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt similarity index 64% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScannerModule.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt index 0143a16937..a9b3809104 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ContentScannerModule.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt @@ -4,30 +4,30 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import dagger.Binds import dagger.Module import dagger.Provides import io.realm.RealmConfiguration -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService import org.matrix.android.sdk.internal.database.RealmKeysUtils import org.matrix.android.sdk.internal.di.ContentScannerDatabase import org.matrix.android.sdk.internal.di.SessionFilesDirectory import org.matrix.android.sdk.internal.di.UserMd5 import org.matrix.android.sdk.internal.session.SessionModule import org.matrix.android.sdk.internal.session.SessionScope -import org.matrix.android.sdk.internal.session.contentscanning.data.ContentScanningStore -import org.matrix.android.sdk.internal.session.contentscanning.db.ContentScannerRealmModule -import org.matrix.android.sdk.internal.session.contentscanning.db.RealmContentScannerStore -import org.matrix.android.sdk.internal.session.contentscanning.tasks.DefaultDownloadEncryptedTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.DefaultGetServerPublicKeyTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.DefaultScanEncryptedTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.DefaultScanMediaTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.DownloadEncryptedTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.GetServerPublicKeyTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.ScanEncryptedTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.ScanMediaTask +import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore +import org.matrix.android.sdk.internal.session.contentscanner.db.ContentScannerRealmModule +import org.matrix.android.sdk.internal.session.contentscanner.db.RealmContentScannerStore +import org.matrix.android.sdk.internal.session.contentscanner.tasks.DefaultDownloadEncryptedTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.DefaultGetServerPublicKeyTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.DefaultScanEncryptedTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.DefaultScanMediaTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.DownloadEncryptedTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.GetServerPublicKeyTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanEncryptedTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanMediaTask import java.io.File @Module @@ -58,7 +58,7 @@ internal abstract class ContentScannerModule { abstract fun bindContentScannerService(service: DefaultContentScannerService): ContentScannerService @Binds - abstract fun bindContentScannerStore(store: RealmContentScannerStore): ContentScanningStore + abstract fun bindContentScannerStore(store: RealmContentScannerStore): ContentScannerStore @Binds abstract fun bindDownloadEncryptedTask(task: DefaultDownloadEncryptedTask): DownloadEncryptedTask diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DefaultContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt similarity index 72% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DefaultContentScannerService.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt index b7292605b1..adfa8ef4d6 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DefaultContentScannerService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import androidx.lifecycle.LiveData import dagger.Lazy @@ -13,18 +13,18 @@ import okhttp3.OkHttpClient import org.matrix.android.sdk.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCoroutineDispatchers import org.matrix.android.sdk.api.NoOpMatrixCallback -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService -import org.matrix.android.sdk.api.session.contentscanning.ScanState -import org.matrix.android.sdk.api.session.contentscanning.ScanStatusInfo +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo import org.matrix.android.sdk.api.util.Optional import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.di.Unauthenticated import org.matrix.android.sdk.internal.network.RetrofitFactory import org.matrix.android.sdk.internal.session.SessionScope -import org.matrix.android.sdk.internal.session.contentscanning.data.ContentScanningStore -import org.matrix.android.sdk.internal.session.contentscanning.tasks.GetServerPublicKeyTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.ScanEncryptedTask -import org.matrix.android.sdk.internal.session.contentscanning.tasks.ScanMediaTask +import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore +import org.matrix.android.sdk.internal.session.contentscanner.tasks.GetServerPublicKeyTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanEncryptedTask +import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanMediaTask import org.matrix.android.sdk.internal.task.TaskExecutor import org.matrix.android.sdk.internal.task.launchToCallback import org.matrix.android.sdk.internal.util.awaitCallback @@ -36,8 +36,8 @@ internal class DefaultContentScannerService @Inject constructor( private val retrofitFactory: RetrofitFactory, @Unauthenticated private val okHttpClient: Lazy, - private val contentScanningApiProvider: ContentScanningApiProvider, - private val contentScanningStore: ContentScanningStore, + private val contentScannerApiProvider: ContentScannerApiProvider, + private val contentScannerStore: ContentScannerStore, // private val sessionParams: SessionParams, private val getServerPublicKeyTask: GetServerPublicKeyTask, private val scanEncryptedTask: ScanEncryptedTask, @@ -51,11 +51,11 @@ internal class DefaultContentScannerService @Inject constructor( private set override fun getContentScannerServer(): String? { - return contentScanningStore.getScannerUrl() + return contentScannerStore.getScannerUrl() } override fun getServerPublicKey(forceDownload: Boolean, callback: MatrixCallback) { - val api = contentScanningApiProvider.contentScannerApi ?: return Unit.also { + val api = contentScannerApiProvider.contentScannerApi ?: return Unit.also { callback.onFailure(IllegalArgumentException("No content scanner defined")) } @@ -102,15 +102,15 @@ internal class DefaultContentScannerService @Inject constructor( } } - override fun setScannerUrl(url: String?) = contentScanningStore.setScannerUrl(url).also { + override fun setScannerUrl(url: String?) = contentScannerStore.setScannerUrl(url).also { if (url == null) { - contentScanningApiProvider.contentScannerApi = null + contentScannerApiProvider.contentScannerApi = null serverPublicKey = null } else { val api = retrofitFactory .create(okHttpClient, url) - .create(ContentScanApi::class.java) - contentScanningApiProvider.contentScannerApi = api + .create(ContentScannerApi::class.java) + contentScannerApiProvider.contentScannerApi = api taskExecutor.executorScope.launch(coroutineDispatchers.io) { try { @@ -124,25 +124,25 @@ internal class DefaultContentScannerService @Inject constructor( } } - override fun enableScanner(enabled: Boolean) = contentScanningStore.enableScanning(enabled) + override fun enableScanner(enabled: Boolean) = contentScannerStore.enableScanning(enabled) - override fun isScannerEnabled(): Boolean = contentScanningStore.isScanEnabled() + override fun isScannerEnabled(): Boolean = contentScannerStore.isScanEnabled() override fun getCachedScanResultForFile(mxcUrl: String): ScanStatusInfo? { - return contentScanningStore.getScanResult(mxcUrl) + return contentScannerStore.getScanResult(mxcUrl) } override fun getLiveStatusForFile(mxcUrl: String, fetchIfNeeded: Boolean): LiveData> { - val data = contentScanningStore.getLiveScanResult(mxcUrl) - if (fetchIfNeeded && !contentScanningStore.isScanResultKnownOrInProgress(mxcUrl, getContentScannerServer())) { + val data = contentScannerStore.getLiveScanResult(mxcUrl) + if (fetchIfNeeded && !contentScannerStore.isScanResultKnownOrInProgress(mxcUrl, getContentScannerServer())) { getScanResultForAttachment(mxcUrl, NoOpMatrixCallback()) } return data } override fun getLiveStatusForEncryptedFile(mxcUrl: String, fileInfo: ElementToDecrypt, fetchIfNeeded: Boolean): LiveData> { - val data = contentScanningStore.getLiveScanResult(mxcUrl) - if (fetchIfNeeded && !contentScanningStore.isScanResultKnownOrInProgress(mxcUrl, getContentScannerServer())) { + val data = contentScannerStore.getLiveScanResult(mxcUrl) + if (fetchIfNeeded && !contentScannerStore.isScanResultKnownOrInProgress(mxcUrl, getContentScannerServer())) { getScanResultForAttachment(mxcUrl, fileInfo, NoOpMatrixCallback()) } return data diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DisabledContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt similarity index 90% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DisabledContentScannerService.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt index 9b003b65fd..6daa094ed2 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/DisabledContentScannerService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.matrix.android.sdk.api.MatrixCallback -import org.matrix.android.sdk.api.session.contentscanning.ContentScannerService -import org.matrix.android.sdk.api.session.contentscanning.ScanStatusInfo +import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService +import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo import org.matrix.android.sdk.api.util.Optional import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ScanEncryptorUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt similarity index 86% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ScanEncryptorUtils.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt index b96305f5ce..567002750f 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/ScanEncryptorUtils.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt @@ -4,15 +4,15 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning +package org.matrix.android.sdk.internal.session.contentscanner import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey import org.matrix.android.sdk.internal.crypto.tools.withOlmEncryption -import org.matrix.android.sdk.internal.session.contentscanning.model.DownloadBody -import org.matrix.android.sdk.internal.session.contentscanning.model.EncryptedBody -import org.matrix.android.sdk.internal.session.contentscanning.model.toCanonicalJson +import org.matrix.android.sdk.internal.session.contentscanner.model.DownloadBody +import org.matrix.android.sdk.internal.session.contentscanner.model.EncryptedBody +import org.matrix.android.sdk.internal.session.contentscanner.model.toCanonicalJson object ScanEncryptorUtils { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/data/ContentScanningStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/data/ContentScannerStore.kt similarity index 76% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/data/ContentScanningStore.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/data/ContentScannerStore.kt index f0db66def4..af43c75c04 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/data/ContentScanningStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/data/ContentScannerStore.kt @@ -4,14 +4,14 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.data +package org.matrix.android.sdk.internal.session.contentscanner.data import androidx.lifecycle.LiveData -import org.matrix.android.sdk.api.session.contentscanning.ScanState -import org.matrix.android.sdk.api.session.contentscanning.ScanStatusInfo +import org.matrix.android.sdk.api.session.contentscanner.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo import org.matrix.android.sdk.api.util.Optional -internal interface ContentScanningStore { +internal interface ContentScannerStore { fun getScannerUrl(): String? diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScanResultEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScanResultEntity.kt similarity index 84% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScanResultEntity.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScanResultEntity.kt index 3125e6c8a6..33284b2556 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScanResultEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScanResultEntity.kt @@ -4,13 +4,13 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.db +package org.matrix.android.sdk.internal.session.contentscanner.db import io.realm.RealmObject import io.realm.annotations.Index import org.matrix.android.sdk.api.extensions.tryOrNull -import org.matrix.android.sdk.api.session.contentscanning.ScanState -import org.matrix.android.sdk.api.session.contentscanning.ScanStatusInfo +import org.matrix.android.sdk.api.session.contentscanner.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo internal open class ContentScanResultEntity( @Index diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt similarity index 94% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerEntityQueries.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt index 402fc98e17..fcabae730b 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.db +package org.matrix.android.sdk.internal.session.contentscanner.db import io.realm.Realm import io.realm.kotlin.createObject diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt similarity index 84% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerInfoEntity.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt index d0a815cc44..da0011db72 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerInfoEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.db +package org.matrix.android.sdk.internal.session.contentscanner.db import io.realm.RealmObject diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt similarity index 87% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerRealmModule.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt index 3d6380c642..aec926beef 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/ContentScannerRealmModule.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.db +package org.matrix.android.sdk.internal.session.contentscanner.db import io.realm.annotations.RealmModule diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/RealmContentScannerStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt similarity index 93% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/RealmContentScannerStore.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt index 16c0ce5075..6b561c3720 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/db/RealmContentScannerStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt @@ -4,14 +4,14 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.db +package org.matrix.android.sdk.internal.session.contentscanner.db import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations import com.zhuinden.monarchy.Monarchy -import org.matrix.android.sdk.internal.session.contentscanning.data.ContentScanningStore -import org.matrix.android.sdk.api.session.contentscanning.ScanState -import org.matrix.android.sdk.api.session.contentscanning.ScanStatusInfo +import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore +import org.matrix.android.sdk.api.session.contentscanner.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo import io.realm.Realm import io.realm.RealmConfiguration import io.realm.kotlin.createObject @@ -28,7 +28,7 @@ import javax.inject.Inject internal class RealmContentScannerStore @Inject constructor( @ContentScannerDatabase private val realmConfiguration: RealmConfiguration -) : ContentScanningStore { +) : ContentScannerStore { private val monarchy = Monarchy.Builder() .setRealmConfiguration(realmConfiguration) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/DownloadBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/DownloadBody.kt similarity index 93% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/DownloadBody.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/DownloadBody.kt index 6d0d401fd8..fbb0688225 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/DownloadBody.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/DownloadBody.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.model +package org.matrix.android.sdk.internal.session.contentscanner.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ScanResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ScanResponse.kt similarity index 88% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ScanResponse.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ScanResponse.kt index 549419f3ca..0a730d614c 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ScanResponse.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ScanResponse.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.model +package org.matrix.android.sdk.internal.session.contentscanner.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ServerPublicKeyResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ServerPublicKeyResponse.kt similarity index 84% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ServerPublicKeyResponse.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ServerPublicKeyResponse.kt index 2706286f56..ca6ffe96b3 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/model/ServerPublicKeyResponse.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/model/ServerPublicKeyResponse.kt @@ -4,7 +4,7 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.model +package org.matrix.android.sdk.internal.session.contentscanner.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/DownloadEncryptedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/DownloadEncryptedTask.kt similarity index 73% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/DownloadEncryptedTask.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/DownloadEncryptedTask.kt index 8bd83b553d..6a9e217740 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/DownloadEncryptedTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/DownloadEncryptedTask.kt @@ -4,13 +4,13 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.tasks +package org.matrix.android.sdk.internal.session.contentscanner.tasks import okhttp3.ResponseBody import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.network.executeRequest -import org.matrix.android.sdk.internal.session.contentscanning.ContentScanningApiProvider -import org.matrix.android.sdk.internal.session.contentscanning.ScanEncryptorUtils +import org.matrix.android.sdk.internal.session.contentscanner.ContentScannerApiProvider +import org.matrix.android.sdk.internal.session.contentscanner.ScanEncryptorUtils import org.matrix.android.sdk.internal.task.Task import javax.inject.Inject @@ -23,7 +23,7 @@ internal interface DownloadEncryptedTask : Task { data class Params( - val contentScanApi: ContentScanApi + val contentScannerApi: ContentScannerApi ) } @@ -22,7 +22,7 @@ internal class DefaultGetServerPublicKeyTask @Inject constructor() : GetServerPu override suspend fun execute(params: GetServerPublicKeyTask.Params): String? { return executeRequest(null) { - params.contentScanApi.getServerPublicKey() + params.contentScannerApi.getServerPublicKey() }.publicKey } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanEncryptedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanEncryptedTask.kt similarity index 59% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanEncryptedTask.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanEncryptedTask.kt index 900f40f7c1..c1185e02ba 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanEncryptedTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanEncryptedTask.kt @@ -4,16 +4,16 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.tasks +package org.matrix.android.sdk.internal.session.contentscanner.tasks import org.matrix.android.sdk.api.failure.toScanFailure -import org.matrix.android.sdk.api.session.contentscanning.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanState import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.network.executeRequest -import org.matrix.android.sdk.internal.session.contentscanning.ContentScanningApiProvider -import org.matrix.android.sdk.internal.session.contentscanning.ScanEncryptorUtils -import org.matrix.android.sdk.internal.session.contentscanning.data.ContentScanningStore -import org.matrix.android.sdk.internal.session.contentscanning.model.ScanResponse +import org.matrix.android.sdk.internal.session.contentscanner.ContentScannerApiProvider +import org.matrix.android.sdk.internal.session.contentscanner.ScanEncryptorUtils +import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore +import org.matrix.android.sdk.internal.session.contentscanner.model.ScanResponse import org.matrix.android.sdk.internal.task.Task import javax.inject.Inject @@ -26,23 +26,23 @@ internal interface ScanEncryptedTask : Task(null) { api.scanFile(dlBody) } - contentScanningStore.updateScanResultForContent( + contentScannerStore.updateScanResultForContent( mxcUrl, scannerUrl, ScanState.TRUSTED.takeIf { executeRequest.clean } ?: ScanState.INFECTED, @@ -50,7 +50,7 @@ internal class DefaultScanEncryptedTask @Inject constructor( ) return executeRequest } catch (failure: Throwable) { - contentScanningStore.updateStateForContent(params.mxcUrl, ScanState.UNKNOWN, scannerUrl) + contentScannerStore.updateStateForContent(params.mxcUrl, ScanState.UNKNOWN, scannerUrl) throw failure.toScanFailure() ?: failure } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanMediaTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanMediaTask.kt similarity index 64% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanMediaTask.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanMediaTask.kt index 5570e218fa..66f5dfef63 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanning/tasks/ScanMediaTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/tasks/ScanMediaTask.kt @@ -4,14 +4,14 @@ * Proprietary and confidential */ -package org.matrix.android.sdk.internal.session.contentscanning.tasks +package org.matrix.android.sdk.internal.session.contentscanner.tasks import org.matrix.android.sdk.api.failure.toScanFailure -import org.matrix.android.sdk.api.session.contentscanning.ScanState +import org.matrix.android.sdk.api.session.contentscanner.ScanState import org.matrix.android.sdk.internal.network.executeRequest -import org.matrix.android.sdk.internal.session.contentscanning.ContentScanningApiProvider -import org.matrix.android.sdk.internal.session.contentscanning.data.ContentScanningStore -import org.matrix.android.sdk.internal.session.contentscanning.model.ScanResponse +import org.matrix.android.sdk.internal.session.contentscanner.ContentScannerApiProvider +import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore +import org.matrix.android.sdk.internal.session.contentscanner.model.ScanResponse import org.matrix.android.sdk.internal.task.Task import javax.inject.Inject @@ -22,8 +22,8 @@ internal interface ScanMediaTask : Task { } internal class DefaultScanMediaTask @Inject constructor( - private val contentScanningApiProvider: ContentScanningApiProvider, - private val contentScanningStore: ContentScanningStore + private val contentScannerApiProvider: ContentScannerApiProvider, + private val contentScannerStore: ContentScannerStore ) : ScanMediaTask { override suspend fun execute(params: ScanMediaTask.Params): ScanResponse { @@ -31,8 +31,8 @@ internal class DefaultScanMediaTask @Inject constructor( if (!params.mxcUrl.startsWith("mxc://")) { throw IllegalAccessException("Invalid mxc url") } - val scannerUrl = contentScanningStore.getScannerUrl() - contentScanningStore.updateStateForContent(params.mxcUrl, ScanState.IN_PROGRESS, scannerUrl) + val scannerUrl = contentScannerStore.getScannerUrl() + contentScannerStore.updateStateForContent(params.mxcUrl, ScanState.IN_PROGRESS, scannerUrl) var serverAndMediaId = params.mxcUrl.removePrefix("mxc://") val fragmentOffset = serverAndMediaId.indexOf("#") @@ -47,10 +47,10 @@ internal class DefaultScanMediaTask @Inject constructor( try { val scanResponse = executeRequest(null) { - val api = contentScanningApiProvider.contentScannerApi ?: throw IllegalArgumentException() + val api = contentScannerApiProvider.contentScannerApi ?: throw IllegalArgumentException() api.scanMedia(split[0], split[1]) } - contentScanningStore.updateScanResultForContent( + contentScannerStore.updateScanResultForContent( params.mxcUrl, scannerUrl, ScanState.TRUSTED.takeIf { scanResponse.clean } ?: ScanState.INFECTED, @@ -58,7 +58,7 @@ internal class DefaultScanMediaTask @Inject constructor( ) return scanResponse } catch (failure: Throwable) { - contentScanningStore.updateStateForContent(params.mxcUrl, ScanState.UNKNOWN, scannerUrl) + contentScannerStore.updateStateForContent(params.mxcUrl, ScanState.UNKNOWN, scannerUrl) throw failure.toScanFailure() ?: failure } }