filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning

This commit is contained in:
Valere 2020-09-30 11:05:06 +02:00
parent 2908a5d345
commit 3642ca5b4a
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/check/forbidden_strings_in_code.txt
View File

@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1
# android\.text\.TextUtils # 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 ### 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 ### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3 import org.matrix.android.sdk.internal.legacy.riot===3

5
vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
View File

@ -113,7 +113,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
// test back // test back
onView(isRoot()).perform(pressBack()) onView(isRoot()).perform(pressBack())
Thread.sleep(1000) Thread.sleep(1000)
onView(withId(R.id.bootstrapSetupSecureUseSecurityKey)) onView(withId(R.id.bootstrapSetupSecureUseSecurityKey))
@ -144,15 +143,12 @@ class SecurityBootstrapTest : VerificationTestBase() {
onView(withId(R.id.ssss_passphrase_enter_edittext)) onView(withId(R.id.ssss_passphrase_enter_edittext))
.perform(replaceText("person woman man camera tv")) .perform(replaceText("person woman man camera tv"))
onView(withId(R.id.bootstrapSubmit)) onView(withId(R.id.bootstrapSubmit))
.perform(closeSoftKeyboard(), click()) .perform(closeSoftKeyboard(), click())
onView(withId(R.id.bottomSheetScrollView)) onView(withId(R.id.bottomSheetScrollView))
.perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content))) .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
intending(hasAction(Intent.ACTION_SEND)).respondWith(ActivityResult(Activity.RESULT_OK, null)) intending(hasAction(Intent.ACTION_SEND)).respondWith(ActivityResult(Activity.RESULT_OK, null))
onView(withId(R.id.recoveryCopy)) onView(withId(R.id.recoveryCopy))
@ -163,7 +159,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
// Dismiss dialog // Dismiss dialog
onView(withText(R.string.ok)).inRoot(RootMatchers.isDialog()).perform(click()) onView(withText(R.string.ok)).inRoot(RootMatchers.isDialog()).perform(click())
onView(withId(R.id.bottomSheetScrollView)) onView(withId(R.id.bottomSheetScrollView))
.perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content))) .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))