From 8a79a7e2c519b3db433e4f3a74231d4be054e3d5 Mon Sep 17 00:00:00 2001 From: Ovsyannikov_M Date: Fri, 16 Aug 2024 18:11:42 +0300 Subject: [PATCH] ISSUE-656: fix comments --- .../kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt | 4 ++-- .../kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt index ea71857c7..6ba974678 100644 --- a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt +++ b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt @@ -2,12 +2,12 @@ package com.kaspersky.kaspresso.params data class SystemDialogsSafetyParams( val shouldIgnoreKeyboard: Boolean, - val shouldIgnorePermissionController: Boolean + val shouldIgnorePermissionDialogs: Boolean ) { companion object { fun default() = SystemDialogsSafetyParams( shouldIgnoreKeyboard = false, - shouldIgnorePermissionController = false + shouldIgnorePermissionDialogs = false ) } } diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt index 19cd6fd9c..9805acc1e 100644 --- a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt +++ b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt @@ -111,8 +111,9 @@ class SystemDialogSafetyProviderImpl( */ private fun isAndroidSystemDetected(): Boolean { with(uiDevice) { - var isSystemDialogVisible = if (systemDialogsSafetyParams.shouldIgnorePermissionController) { - SystemDialogSafetyPattern.values().filter { it != SystemDialogSafetyPattern.PERMISSION_API30 }.any { isVisible(By.pkg(it.pattern).clazz(FrameLayout::class.java)) } + var isSystemDialogVisible = if (systemDialogsSafetyParams.shouldIgnorePermissionDialogs) { + SystemDialogSafetyPattern.values().filter { it != SystemDialogSafetyPattern.PERMISSION_API30 && it != SystemDialogSafetyPattern.PERMISSION_API23} + .any { isVisible(By.pkg(it.pattern).clazz(FrameLayout::class.java)) } } else { SystemDialogSafetyPattern.values().any { isVisible(By.pkg(it.pattern).clazz(FrameLayout::class.java)) } }