@@ -270,27 +270,11 @@ 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- }
273+ val secureText = stringResource(R .string.nc_password_secure)
274+ val warningMessage = passwordWarningMessage(validationState, secureText)
291275
292276 val isPasswordValid =
293- password.isNotBlank() && warningMessage == stringResource( R .string.nc_password_secure)
277+ password.isNotBlank() && warningMessage == secureText
294278
295279 AlertDialog (
296280 onDismissRequest = onDismiss,
@@ -347,3 +331,22 @@ private fun GuestAccessPasswordDialog(
347331 }
348332 )
349333}
334+
335+ @Composable
336+ private fun passwordWarningMessage (
337+ validationState : ConversationInfoViewModel .SecurePasswordViewState ,
338+ secureText : String
339+ ): String? =
340+ when (validationState) {
341+ is ConversationInfoViewModel .SecurePasswordViewState .Success -> {
342+ validationState.result.passed?.let { passed ->
343+ if (passed) secureText else validationState.result.reason
344+ }
345+ }
346+
347+ is ConversationInfoViewModel .SecurePasswordViewState .Error -> {
348+ stringResource(R .string.nc_common_error_sorry)
349+ }
350+
351+ ConversationInfoViewModel .SecurePasswordViewState .None -> " "
352+ }
0 commit comments