jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code quality and compilation test

This commit is contained in:
Benoit Marty 2020-10-02 17:18:39 +02:00
parent c996bcb23c
commit f030e098a8
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
View File

@ -90,7 +90,7 @@ class SearchMessagesTest : InstrumentedTest {
assertTrue( assertTrue(
data.results data.results
?.all { ?.all {
(it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse() (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
}.orFalse() }.orFalse()
) )
lock.countDown() lock.countDown()
@ -154,7 +154,7 @@ class SearchMessagesTest : InstrumentedTest {
assertTrue( assertTrue(
data.results data.results
?.all { ?.all {
(it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse() (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
}.orFalse() }.orFalse()
) )
lock.countDown() lock.countDown()

13
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
View File

@ -22,15 +22,22 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
internal data class SearchResponseRoomEvents( internal data class SearchResponseRoomEvents(
// List of results in the requested order. /**
* List of results in the requested order.
*/
@Json(name = "results") @Json(name = "results")
val results: List<SearchResponseItem>? = null, val results: List<SearchResponseItem>? = null,
@Json(name = "count") @Json(name = "count")
val count: Int? = null, val count: Int? = null,
// List of words which should be highlighted, useful for stemming which may change the query terms. /**
* List of words which should be highlighted, useful for stemming which may change the query terms.
*/
@Json(name = "highlights") @Json(name = "highlights")
val highlights: List<String>? = null, val highlights: List<String>? = null,
// Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call. If this field is absent, there are no more results. /**
* Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call.
* If this field is absent, there are no more results.
*/
@Json(name = "next_batch") @Json(name = "next_batch")
val nextBatch: String? = null val nextBatch: String? = null
) )

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===80 enum class===81
### 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