From 3642ca5b4a1a6943ca5bcc77c2b7ec8e85f5ba3d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 30 Sep 2020 11:05:06 +0200
Subject: [PATCH] cleaning
---
tools/check/forbidden_strings_in_code.txt | 2 +-
.../androidTest/java/im/vector/app/SecurityBootstrapTest.kt | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 3ced7de7e2..1d3aaa9f69 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1
# android\.text\.TextUtils
### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===78
+enum class===80
### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index a71af59edf..3bf17aa043 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -113,7 +113,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
// test back
onView(isRoot()).perform(pressBack())
-
Thread.sleep(1000)
onView(withId(R.id.bootstrapSetupSecureUseSecurityKey))
@@ -144,15 +143,12 @@ class SecurityBootstrapTest : VerificationTestBase() {
onView(withId(R.id.ssss_passphrase_enter_edittext))
.perform(replaceText("person woman man camera tv"))
-
onView(withId(R.id.bootstrapSubmit))
.perform(closeSoftKeyboard(), click())
onView(withId(R.id.bottomSheetScrollView))
.perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
-
-
intending(hasAction(Intent.ACTION_SEND)).respondWith(ActivityResult(Activity.RESULT_OK, null))
onView(withId(R.id.recoveryCopy))
@@ -163,7 +159,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
// Dismiss dialog
onView(withText(R.string.ok)).inRoot(RootMatchers.isDialog()).perform(click())
-
onView(withId(R.id.bottomSheetScrollView))
.perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))