diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt index ba9dec0877..70eea6c26e 100644 --- a/tools/check/forbidden_strings_in_code.txt +++ b/tools/check/forbidden_strings_in_code.txt @@ -162,7 +162,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 the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt -enum class===102 +enum class===103 ### Do not import temporary legacy classes import org.matrix.android.sdk.internal.legacy.riot===3 diff --git a/vector/src/main/res/drawable/ic_play_pause_play.xml b/vector/src/main/res/drawable/ic_play_pause_play.xml index f632fad8ed..84056219ec 100644 --- a/vector/src/main/res/drawable/ic_play_pause_play.xml +++ b/vector/src/main/res/drawable/ic_play_pause_play.xml @@ -1,7 +1,6 @@ diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 323f533425..cf88c1e101 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -3439,7 +3439,7 @@ Upgrade to the recommended room version Sorry, an error occurred while trying to join: %s - + Start Voice Message Slide to cancel Voice Message Lock