chore: allow customising a client name with a suffix [ACOL-144] (#2480)

* chore: client flavor and build type * detekt fix * typo fix
wireapp · Feb 9, 2024 · c534b24 · c534b24
1 parent 98d2d4f
commit c534b24
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientMapper.kt
@@ -55,7 +55,7 @@ class ClientMapper(
         deviceType = toDeviceTypeDTO(clientConfig.deviceType()),
         type = param.clientType?.let { toClientTypeDTO(param.clientType) } ?: toClientTypeDTO(clientConfig.clientType()),
         capabilities = param.capabilities?.let { capabilities -> capabilities.map { toClientCapabilityDTO(it) } },
-        model = param.model?.let { param.model } ?: clientConfig.deviceModelName(),
+        model = (param.model?.let { param.model } ?: clientConfig.deviceModelName()) + param.modelPostfix.orEmpty(),
         preKeys = param.preKeys.map { preyKeyMapper.toPreKeyDTO(it) },
         cookieLabel = param.cookieLabel,
         secondFactorVerificationCode = param.secondFactorVerificationCode,

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientModel.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientModel.kt
@@ -35,6 +35,7 @@ data class RegisterClientParam(
     val model: String?,
     val cookieLabel: String?,
     val secondFactorVerificationCode: String? = null,
+    val modelPostfix: String? = null
 )
 
 data class DeleteClientParam(

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt
@@ -107,6 +107,7 @@ interface RegisterClientUseCase {
         val model: String? = null,
         val preKeysToSend: Int = DEFAULT_PRE_KEYS_COUNT,
         val secondFactorVerificationCode: String? = null,
+        val modelPostfix: String? = null
     )
 
     companion object {
@@ -135,7 +136,16 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr
         val verificationCode = registerClientParam.secondFactorVerificationCode ?: currentlyStoredVerificationCode()
         sessionRepository.cookieLabel(selfUserId)
             .flatMap { cookieLabel ->
-                generateProteusPreKeys(preKeysToSend, password, capabilities, clientType, model, cookieLabel, verificationCode)
+                generateProteusPreKeys(
+                    preKeysToSend,
+                    password,
+                    capabilities,
+                    clientType,
+                    model,
+                    cookieLabel,
+                    verificationCode,
+                    modelPostfix
+                )
             }.fold({
                 RegisterClientResult.Failure.Generic(it)
             }, { registerClientParam ->
@@ -209,6 +219,7 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr
         model: String? = null,
         cookieLabel: String?,
         secondFactorVerificationCode: String? = null,
+        modelPostfix: String?
     ) = withContext(dispatchers.io) {
         preKeyRepository.generateNewPreKeys(FIRST_KEY_ID, preKeysToSend).flatMap { preKeys ->
             preKeyRepository.generateNewLastResortKey().flatMap { lastKey ->
@@ -224,6 +235,7 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr
                         clientType = clientType,
                         cookieLabel = cookieLabel,
                         secondFactorVerificationCode = secondFactorVerificationCode,
+                        modelPostfix = modelPostfix
                     )
                 )
             }