Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE-656: add flag to remove PermissionController #657

Merged
merged 3 commits into from
Nov 22, 2024
Merged

ISSUE-656: add flag to remove PermissionController #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06fdd20
ISSUE-656: add flag to remove PermissionController
OvsyannikovMaksim Aug 14, 2024
8a79a7e
ISSUE-656: fix comments
OvsyannikovMaksim Aug 16, 2024
9dc0052
ISSUE-656: fix detekt
OvsyannikovMaksim Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions kaspresso/src/main/kotlin/com/kaspersky/kaspresso/params/SystemDialogsSafetyParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.kaspersky.kaspresso.params

data class SystemDialogsSafetyParams(
val shouldIgnoreKeyboard: Boolean
val shouldIgnoreKeyboard: Boolean,
val shouldIgnorePermissionDialogs: Boolean
) {
companion object {
fun default() = SystemDialogsSafetyParams(shouldIgnoreKeyboard = false)
fun default() = SystemDialogsSafetyParams(
shouldIgnoreKeyboard = false,
shouldIgnorePermissionDialogs = false
)
}
}
13 changes: 9 additions & 4 deletions ...so/src/main/kotlin/com/kaspersky/kaspresso/systemsafety/SystemDialogSafetyProviderImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class SystemDialogSafetyProviderImpl(

private val attemptsToSuppress: List<(UiDevice, AdbServer) -> Unit> = listOf(
{ _, adbServer ->
adbServer.performShell("input keyevent KEYCODE_BACK")
adbServer.performShell("input keyevent KEYCODE_ENTER")
adbServer.performShell("input keyevent KEYCODE_ENTER")
adbServer.performShell("input", listOf("keyevent", "KEYCODE_BACK"))
adbServer.performShell("input", listOf("keyevent", "KEYCODE_ENTER"))
adbServer.performShell("input", listOf("keyevent", "KEYCODE_ENTER"))
},
{ uiDevice, _ -> uiDevice.wait(Until.findObject(By.res("android:id/button1")), DEFAULT_TIMEOUT).click() },
{ uiDevice, _ -> uiDevice.wait(Until.findObject(By.res("android:id/closeButton")), DEFAULT_TIMEOUT).click() },
Expand Down Expand Up @@ -111,7 +111,12 @@ class SystemDialogSafetyProviderImpl(
*/
private fun isAndroidSystemDetected(): Boolean {
with(uiDevice) {
var isSystemDialogVisible = SystemDialogSafetyPattern.values().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 }
CherchesovAzamat marked this conversation as resolved.
Show resolved Hide resolved
.any { isVisible(By.pkg(it.pattern).clazz(FrameLayout::class.java)) }
} else {
SystemDialogSafetyPattern.values().any { isVisible(By.pkg(it.pattern).clazz(FrameLayout::class.java)) }
}

if (systemDialogsSafetyParams.shouldIgnoreKeyboard) {
val isKeyboardVisible = isVisible(By.pkg(Pattern.compile("\\S*google.android.inputmethod\\S*")).clazz(FrameLayout::class.java))
Expand Down
Loading