rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving matrix client info related component to core package

Browse Source
This commit is contained in:
Maxime NATUREL 2022-10-03 14:55:11 +02:00
parent 1e6fb99e3c
commit 0c6d49856c
9 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCase.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt
View File

@ -14,9 +14,8 @@
* limitations under the License. * 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 im.vector.app.core.di.ActiveSessionHolder
import org.matrix.android.sdk.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import javax.inject.Inject import javax.inject.Inject

3
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/MatrixClientInfoContent.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt
View File

@ -14,11 +14,10 @@
* limitations under the License. * 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.Json
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class MatrixClientInfoContent( data class MatrixClientInfoContent(

2
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/NoDeviceIdError.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt
View File

@ -14,6 +14,6 @@
* limitations under the License. * 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") class NoDeviceIdError : IllegalStateException("device id is empty")

4
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SessionExtendedInfoConstants.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt
View File

@ -14,7 +14,9 @@
* limitations under the License. * 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." const val MATRIX_CLIENT_INFO_KEY_PREFIX = "io.element.matrix_client_information."

3
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCase.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt
View File

@ -14,9 +14,8 @@
* limitations under the License. * 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 im.vector.app.core.di.ActiveSessionHolder
import org.matrix.android.sdk.api.session.events.model.toContent import org.matrix.android.sdk.api.session.events.model.toContent
import javax.inject.Inject import javax.inject.Inject

3
vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCase.kt → vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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.di.ActiveSessionHolder
import im.vector.app.core.resources.AppNameProvider import im.vector.app.core.resources.AppNameProvider
@ -32,7 +32,6 @@ class UpdateMatrixClientInfoUseCase @Inject constructor(
private val setMatrixClientInfoUseCase: SetMatrixClientInfoUseCase, private val setMatrixClientInfoUseCase: SetMatrixClientInfoUseCase,
) { ) {
// TODO call the use case after signin + on app startup
suspend fun execute(): Result<Unit> = runCatching { suspend fun execute(): Result<Unit> = runCatching {
val clientInfo = MatrixClientInfoContent( val clientInfo = MatrixClientInfoContent(
name = appNameProvider.getAppName(), name = appNameProvider.getAppName(),

3
vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/GetMatrixClientInfoUseCaseTest.kt → vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt
View File

@ -14,9 +14,8 @@
* limitations under the License. * 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 im.vector.app.test.fakes.FakeActiveSessionHolder
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe
import org.amshove.kluent.shouldBeEqualTo import org.amshove.kluent.shouldBeEqualTo

3
vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/SetMatrixClientInfoUseCaseTest.kt → vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt
View File

@ -14,9 +14,8 @@
* limitations under the License. * 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 im.vector.app.test.fakes.FakeActiveSessionHolder
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe

2
vector/src/test/java/im/vector/app/features/settings/devices/v2/details/extended/UpdateMatrixClientInfoUseCaseTest.kt → vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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.core.resources.BuildMeta
import im.vector.app.test.fakes.FakeActiveSessionHolder import im.vector.app.test.fakes.FakeActiveSessionHolder