Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add client suffix on debug builds [ACOL-144] #2678

Merged
merged 4 commits into from
Feb 9, 2024
Merged

chore: add client suffix on debug builds [ACOL-144] #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b74094
chore: show device with flavor and build type
Garzas Feb 9, 2024
cf46985
kalium update
Garzas Feb 9, 2024
5531a2c
Merge branch 'develop' into chore/device-flavor-and-build-type
Garzas Feb 9, 2024
a1ea781
detekt fix
Garzas Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.BuildConfig
import com.wire.android.di.AuthServerConfigProvider
import com.wire.android.di.ClientScopeProvider
import com.wire.android.di.KaliumCoreLogic
Expand Down Expand Up @@ -209,7 +210,8 @@
clientScopeProviderFactory.create(userId).clientScope.getOrRegister(
RegisterClientUseCase.RegisterClientParam(
password = password,
capabilities = null
capabilities = null,

Check warning on line 213 in app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt

View check run for this annotation

Codecov / codecov/patch

app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt#L213 

Added line #L213 was not covered by tests
modelPostfix = if (BuildConfig.PRIVATE_BUILD) " [${BuildConfig.FLAVOR}_${BuildConfig.BUILD_TYPE}]" else null
)
)

Expand Down
5 changes: 4 additions & 1 deletion ...ain/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.BuildConfig
import com.wire.android.datastore.UserDataStore
import com.wire.kalium.logic.feature.client.GetOrRegisterClientUseCase
import com.wire.kalium.logic.feature.client.RegisterClientResult
Expand Down Expand Up @@ -79,6 +80,7 @@ class RegisterDeviceViewModel @Inject constructor(
RegisterClientUseCase.RegisterClientParam(
password = password,
capabilities = null,
modelPostfix = if (BuildConfig.PRIVATE_BUILD) " [${BuildConfig.FLAVOR}_${BuildConfig.BUILD_TYPE}]" else null
)
)) {
is RegisterClientResult.Failure.TooManyClients ->
Expand Down Expand Up @@ -113,7 +115,8 @@ class RegisterDeviceViewModel @Inject constructor(
flowState = RegisterDeviceFlowState.Error.InvalidCredentialsError
)

is RegisterClientResult.Failure.PasswordAuthRequired -> { /* app is already waiting for the user to enter the password */ }
is RegisterClientResult.Failure.PasswordAuthRequired -> { /* app is already waiting for the user to enter the password */
}
}
}

Expand Down
6 changes: 5 additions & 1 deletion ...rc/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.BuildConfig
import com.wire.android.datastore.UserDataStore
import com.wire.android.ui.authentication.devices.model.Device
import com.wire.kalium.logic.data.client.ClientType
Expand Down Expand Up @@ -115,7 +116,10 @@

private suspend fun registerClient(password: String?, onCompleted: (initialSyncCompleted: Boolean, isE2EIRequired: Boolean) -> Unit) {
registerClientUseCase(
RegisterClientUseCase.RegisterClientParam(password, null)
RegisterClientUseCase.RegisterClientParam(
password, null,

Check warning on line 120 in app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceViewModel.kt

View check run for this annotation

Codecov / codecov/patch

app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceViewModel.kt#L119-L120 

Added lines #L119 - L120 were not covered by tests
modelPostfix = if (BuildConfig.PRIVATE_BUILD) " [${BuildConfig.FLAVOR}_${BuildConfig.BUILD_TYPE}]" else null
)
).also { result ->
when (result) {
is RegisterClientResult.Failure.PasswordAuthRequired -> {
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.BuildConfig
import com.wire.android.datastore.UserDataStoreProvider
import com.wire.android.di.AuthServerConfigProvider
import com.wire.android.di.ClientScopeProvider
Expand Down Expand Up @@ -84,8 +85,8 @@ open class LoginViewModel @Inject constructor(
userIdentifierEnabled = preFilledUserIdentifier is PreFilledUserIdentifierType.None,
password = TextFieldValue(String.EMPTY),
isProxyAuthRequired =
if (serverConfig.apiProxy?.needsAuthentication != null) serverConfig.apiProxy?.needsAuthentication!!
else false,
if (serverConfig.apiProxy?.needsAuthentication != null) serverConfig.apiProxy?.needsAuthentication!!
else false,
isProxyEnabled = serverConfig.apiProxy != null
)
)
Expand Down Expand Up @@ -136,7 +137,8 @@ open class LoginViewModel @Inject constructor(
RegisterClientUseCase.RegisterClientParam(
password = password,
capabilities = capabilities,
secondFactorVerificationCode = secondFactorVerificationCode
secondFactorVerificationCode = secondFactorVerificationCode,
modelPostfix = if (BuildConfig.PRIVATE_BUILD) " [${BuildConfig.FLAVOR}_${BuildConfig.BUILD_TYPE}]" else null
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 4 files
+1 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientMapper.kt
+1 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientModel.kt
+7 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+13 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt
Loading