mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-25 07:19:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Code quality

Browse source
This commit is contained in:
Valere 2021-07-15 14:46:41 +02:00
parent a626f42a3b
commit 5adceaca23
4 changed files with 11 additions and 9 deletions
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create
RoomFeaturePreset.kt
tools/check
forbidden_strings_in_code.txt
vector/src/main
java/im/vector/app/features/roomprofile/settings/joinrule/advanced
RoomJoinRuleChooseRestrictedViewModel.kt
res/layout
fragment_space_restricted_select.xml

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomFeaturePreset.kt
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021 New Vector Ltd * Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
tools/check/forbidden_strings_in_code.txt
View file

@ -162,7 +162,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 the enum is not used as a Json class, 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 the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
enum class===103 enum class===104
### 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

12
vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
View file

@ -354,11 +354,13 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
viewModelScope.launch { viewModelScope.launch {
if (vectorPreferences.developerMode()) { if (vectorPreferences.developerMode()) {
// in developer mode we let you choose any room or space to restrict to // in developer mode we let you choose any room or space to restrict to
val filteredCandidates = session.getRoomSummaries(roomSummaryQueryParams { val filteredCandidates = session.getRoomSummaries(
excludeType = null roomSummaryQueryParams {
displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE) excludeType = null
memberships = listOf(Membership.JOIN) displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
}).map { it.toMatrixItem() } memberships = listOf(Membership.JOIN)
}
).map { it.toMatrixItem() }
setState { setState {
copy( copy(
filteredResults = Success(filteredCandidates) filteredResults = Success(filteredCandidates)

4
vector/src/main/res/layout/fragment_space_restricted_select.xml
View file

@ -22,7 +22,7 @@
app:titleEnabled="false" app:titleEnabled="false"
app:toolbarId="@+id/toolbar"> app:toolbarId="@+id/toolbar">
<androidx.appcompat.widget.Toolbar <com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -47,7 +47,7 @@
android:textColor="?vctr_content_secondary" /> android:textColor="?vctr_content_secondary" />
</LinearLayout> </LinearLayout>
</androidx.appcompat.widget.Toolbar> </com.google.android.material.appbar.MaterialToolbar>
<!-- <com.google.android.material.appbar.MaterialToolbar--> <!-- <com.google.android.material.appbar.MaterialToolbar-->