GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/bma/math_final

Browse Source
This commit is contained in:
Benoit Marty
2022-01-04 16:13:23 +01:00
committed by GitHub
parent b39caeb04d 39ff9da3c1
commit 7bbea52e66
314 changed files with 6789 additions and 5786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/check/forbidden_strings_in_code.txt
View File

@@ -32,8 +32,6 @@
import static
### Rubbish from merge. Please delete those lines (sometimes in comment)
<<<<<<<
>>>>>>>
### carry return before "}". Please remove empty lines.
\n\s*\n\s*\}
@@ -160,7 +158,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===116
enum class===117
### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3