From 0c6d49856c80e5467c3421ea8302baec09300e6f Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 3 Oct 2022 14:55:11 +0200 Subject: [PATCH] Moving matrix client info related component to core package --- .../session/clientinfo}/GetMatrixClientInfoUseCase.kt | 3 +-- .../session/clientinfo}/MatrixClientInfoContent.kt | 3 +-- .../extended => core/session/clientinfo}/NoDeviceIdError.kt | 2 +- .../session/clientinfo}/SessionExtendedInfoConstants.kt | 4 +++- .../session/clientinfo}/SetMatrixClientInfoUseCase.kt | 3 +-- .../session/clientinfo}/UpdateMatrixClientInfoUseCase.kt | 3 +-- .../session/clientinfo}/GetMatrixClientInfoUseCaseTest.kt | 3 +-- .../session/clientinfo}/SetMatrixClientInfoUseCaseTest.kt | 3 +-- .../session/clientinfo}/UpdateMatrixClientInfoUseCaseTest.kt | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/GetMatrixClientInfoUseCase.kt (93%) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/MatrixClientInfoContent.kt (91%) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/NoDeviceIdError.kt (90%) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/SessionExtendedInfoConstants.kt (86%) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/SetMatrixClientInfoUseCase.kt (93%) rename vector/src/main/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/UpdateMatrixClientInfoUseCase.kt (93%) rename vector/src/test/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/GetMatrixClientInfoUseCaseTest.kt (96%) rename vector/src/test/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/SetMatrixClientInfoUseCaseTest.kt (97%) rename vector/src/test/java/im/vector/app/{features/settings/devices/v2/details/extended => core/session/clientinfo}/UpdateMatrixClientInfoUseCaseTest.kt (98%) diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt similarity index 93% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCase.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt index c248340786..270457504c 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCase.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo -import MATRIX_CLIENT_INFO_KEY_PREFIX import im.vector.app.core.di.ActiveSessionHolder import org.matrix.android.sdk.api.session.events.model.toModel import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/MatrixClientInfoContent.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt similarity index 91% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/MatrixClientInfoContent.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt index a2b7191bb7..aacee6edef 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/MatrixClientInfoContent.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt @@ -14,11 +14,10 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.squareup.moshi.Moshi @JsonClass(generateAdapter = true) data class MatrixClientInfoContent( diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/NoDeviceIdError.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt similarity index 90% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/NoDeviceIdError.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt index c021a6703a..c2b4445205 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/NoDeviceIdError.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo class NoDeviceIdError : IllegalStateException("device id is empty") diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SessionExtendedInfoConstants.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt similarity index 86% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SessionExtendedInfoConstants.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt index b87ebc1ffc..80f69df1f8 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SessionExtendedInfoConstants.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt @@ -14,7 +14,9 @@ * limitations under the License. */ +package im.vector.app.core.session.clientinfo + /** - * Prefix for th key account data event which holds client info. + * Prefix for the key account data event which holds client info. */ const val MATRIX_CLIENT_INFO_KEY_PREFIX = "io.element.matrix_client_information." diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt similarity index 93% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCase.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt index b71e447ace..677d589dec 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCase.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo -import MATRIX_CLIENT_INFO_KEY_PREFIX import im.vector.app.core.di.ActiveSessionHolder import org.matrix.android.sdk.api.session.events.model.toContent import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt similarity index 93% rename from vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCase.kt rename to vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt index c2c75e0409..d4d35db4bb 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCase.kt +++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.resources.AppNameProvider @@ -32,7 +32,6 @@ class UpdateMatrixClientInfoUseCase @Inject constructor( private val setMatrixClientInfoUseCase: SetMatrixClientInfoUseCase, ) { - // TODO call the use case after signin + on app startup suspend fun execute(): Result = runCatching { val clientInfo = MatrixClientInfoContent( name = appNameProvider.getAppName(), diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt similarity index 96% rename from vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCaseTest.kt rename to vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt index 4a90f90c13..11af91c0f6 100644 --- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCaseTest.kt +++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo -import MATRIX_CLIENT_INFO_KEY_PREFIX import im.vector.app.test.fakes.FakeActiveSessionHolder import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBeEqualTo diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt similarity index 97% rename from vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCaseTest.kt rename to vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt index c7c8f562b1..f06b3a0951 100644 --- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCaseTest.kt +++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo -import MATRIX_CLIENT_INFO_KEY_PREFIX import im.vector.app.test.fakes.FakeActiveSessionHolder import kotlinx.coroutines.test.runTest import org.amshove.kluent.shouldBe diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt similarity index 98% rename from vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCaseTest.kt rename to vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt index 2151b15d27..4380d61520 100644 --- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCaseTest.kt +++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.settings.devices.v2.details.extended +package im.vector.app.core.session.clientinfo import im.vector.app.core.resources.BuildMeta import im.vector.app.test.fakes.FakeActiveSessionHolder