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/aris/threads

Browse Source 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
This commit is contained in:
ariskotsomitopoulos
2022-01-11 14:09:49 +02:00
parent 37ec3fdf84 5b1de70742
commit 3bd21d04d8
136 changed files with 1764 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/check/forbidden_strings_in_code.txt
View File

@@ -160,7 +160,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===121
enum class===122
### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3