From 4fbc4ebcf5d67fe7b47b3c60f4e7ff9308fee0bb Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 10:59:31 +0100 Subject: [PATCH] fix detekt Signed-off-by: alperozturk96 [skip ci] --- .../utils/e2ee/model/E2EEKeyCheck.kt | 64 +++++++------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt index 17e1a328f2db..9f4d71cc8c74 100644 --- a/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt +++ b/app/src/main/java/com/nextcloud/utils/e2ee/model/E2EEKeyCheck.kt @@ -57,47 +57,23 @@ enum class E2EEKeyCheck { @Suppress("CyclomaticComplexMethod") fun getMessageId(action: E2EEAction): Int? = when (this) { - NO_NETWORK -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_no_network - } - - E2EEAction.OPEN -> { - R.string.encryption_open_no_network - } - - else -> { - R.string.encryption_encrypt_no_network - } - } - - CHECK_FAILED -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_check_failed - } - - E2EEAction.OPEN -> { - R.string.encryption_open_check_failed - } - - else -> { - R.string.encryption_encrypt_check_failed - } - } - - E2EE_UNAVAILABLE -> when (action) { - E2EEAction.NEW_FOLDER -> { - R.string.encryption_new_folder_unavailable - } - - E2EEAction.OPEN -> { - R.string.encryption_open_unavailable - } - - else -> { - R.string.encryption_encrypt_unavailable - } - } + NO_NETWORK -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_no_network, + openId = R.string.encryption_open_no_network, + encryptId = R.string.encryption_encrypt_no_network + ) + + CHECK_FAILED -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_check_failed, + openId = R.string.encryption_open_check_failed, + encryptId = R.string.encryption_encrypt_check_failed + ) + + E2EE_UNAVAILABLE -> action.pickMessageId( + newFolderId = R.string.encryption_new_folder_unavailable, + openId = R.string.encryption_open_unavailable, + encryptId = R.string.encryption_encrypt_unavailable + ) MISSING_EVERYWHERE -> { if (action == E2EEAction.OPEN) { @@ -109,4 +85,10 @@ enum class E2EEKeyCheck { else -> null } + + private fun E2EEAction.pickMessageId(newFolderId: Int, openId: Int, encryptId: Int): Int = when (this) { + E2EEAction.NEW_FOLDER -> newFolderId + E2EEAction.OPEN -> openId + E2EEAction.ENCRYPT -> encryptId + } }