@@ -270,27 +270,10 @@ private fun GuestAccessPasswordDialog(
270270 onSave : (password: String , copyAfterSave: Boolean ) -> Unit
271271) {
272272 var password by rememberSaveable { mutableStateOf(" " ) }
273-
274- val warningMessage = when (validationState) {
275- is ConversationInfoViewModel .SecurePasswordViewState .Success -> {
276- validationState.result.passed?.let { validPassword ->
277- if (! validPassword) {
278- validationState.result.reason
279- } else {
280- stringResource(R .string.nc_password_secure)
281- }
282- }
283- }
284-
285- is ConversationInfoViewModel .SecurePasswordViewState .Error -> {
286- stringResource(id = R .string.nc_common_error_sorry)
287- }
288-
289- ConversationInfoViewModel .SecurePasswordViewState .None -> " "
290- }
291-
273+ val secureText = stringResource(R .string.nc_password_secure)
274+ val warningMessage = passwordWarningMessage(validationState, secureText)
292275 val isPasswordValid =
293- password.isNotBlank() && warningMessage == stringResource( R .string.nc_password_secure)
276+ password.isNotBlank() && warningMessage == secureText
294277
295278 AlertDialog (
296279 onDismissRequest = onDismiss,
@@ -331,7 +314,6 @@ private fun GuestAccessPasswordDialog(
331314 ) {
332315 Text (text = stringResource(R .string.nc_copy_password))
333316 }
334-
335317 TextButton (
336318 onClick = { onSave(password, false ) },
337319 enabled = isPasswordValid
@@ -347,3 +329,22 @@ private fun GuestAccessPasswordDialog(
347329 }
348330 )
349331}
332+
333+ @Composable
334+ private fun passwordWarningMessage (
335+ validationState : ConversationInfoViewModel .SecurePasswordViewState ,
336+ secureText : String
337+ ): String? =
338+ when (validationState) {
339+ is ConversationInfoViewModel .SecurePasswordViewState .Success -> {
340+ validationState.result.passed?.let { passed ->
341+ if (passed) secureText else validationState.result.reason
342+ }
343+ }
344+
345+ is ConversationInfoViewModel .SecurePasswordViewState .Error -> {
346+ stringResource(R .string.nc_common_error_sorry)
347+ }
348+
349+ ConversationInfoViewModel .SecurePasswordViewState .None -> " "
350+ }
0 commit comments