diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt index fbe951ebb1..cf51dc9c30 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt @@ -59,6 +59,7 @@ class QrCodeIntroPresenter @Inject constructor( } return QrCodeIntroState( + appName = buildMeta.applicationName, desktopAppName = buildMeta.desktopApplicationName, cameraPermissionState = cameraPermissionState, canContinue = canContinue, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt index 9d9609acdf..a385797882 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt @@ -19,6 +19,7 @@ package io.element.android.features.login.impl.screens.qrcode.intro import io.element.android.libraries.permissions.api.PermissionsState data class QrCodeIntroState( + val appName: String, val desktopAppName: String, val cameraPermissionState: PermissionsState, val canContinue: Boolean, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt index 7f7c62cd03..ba1ebeab48 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt @@ -31,6 +31,7 @@ open class QrCodeIntroStateProvider : PreviewParameterProvider } fun aQrCodeIntroState( + appName: String = "AppName", desktopAppName: String = "Element", cameraPermissionState: PermissionsState = aPermissionsState( showDialog = false, @@ -39,6 +40,7 @@ fun aQrCodeIntroState( canContinue: Boolean = false, eventSink: (QrCodeIntroEvents) -> Unit = {}, ) = QrCodeIntroState( + appName = appName, desktopAppName = desktopAppName, cameraPermissionState = cameraPermissionState, canContinue = canContinue, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt index 12e8de01f0..9d06e4e00d 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt @@ -66,7 +66,7 @@ fun QrCodeIntroView( PermissionsView( title = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_title), - content = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_description), + content = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_description, state.appName), icon = { Icon(imageVector = CompoundIcons.TakePhotoSolid(), contentDescription = null) }, state = state.cameraPermissionState, ) diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt index 336e8d2114..6e51109097 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt @@ -35,7 +35,8 @@ class QrCodeIntroPresenterTest { presenter.present() }.test { awaitItem().run { - assertThat(desktopAppName).isEmpty() + assertThat(appName).isEqualTo("AppName") + assertThat(desktopAppName).isEqualTo("DesktopAppName") assertThat(cameraPermissionState.permission).isEqualTo("android.permission.POST_NOTIFICATIONS") assertThat(canContinue).isFalse() } @@ -69,7 +70,10 @@ class QrCodeIntroPresenterTest { } private fun createQrCodeIntroPresenter( - buildMeta: BuildMeta = aBuildMeta(), + buildMeta: BuildMeta = aBuildMeta( + applicationName = "AppName", + desktopApplicationName = "DesktopAppName", + ), permissionsPresenterFactory: FakePermissionsPresenterFactory = FakePermissionsPresenterFactory(), ): QrCodeIntroPresenter { return QrCodeIntroPresenter(