filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-09 16:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code

Browse Source
This commit is contained in:
Benoit Marty 2020-02-20 18:05:53 +01:00
parent d867b1345f
commit b85c76b172
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
View File

@ -122,9 +122,9 @@ object MatrixPatterns {
*/ */
fun isEventId(str: String?): Boolean { fun isEventId(str: String?): Boolean {
return str != null return str != null
&& (str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER && (str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER
|| str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V3 || str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V3
|| str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4) || str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4)
} }
/** /**
@ -144,14 +144,6 @@ object MatrixPatterns {
* @return null if not found or if matrixId is null * @return null if not found or if matrixId is null
*/ */
fun extractServerNameFromId(matrixId: String?): String? { fun extractServerNameFromId(matrixId: String?): String? {
if (matrixId == null) { return matrixId?.substringAfter(":", missingDelimiterValue = "")?.takeIf { it.isNotEmpty() }
return null
}
val index = matrixId.indexOf(":")
return if (index == -1) {
null
} else matrixId.substring(index + 1)
} }
} }

12
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -297,15 +297,11 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
if (isRoomJoined) { if (isRoomJoined) {
setState { copy(tombstoneEventHandling = Success(roomId)) } setState { copy(tombstoneEventHandling = Success(roomId)) }
} else { } else {
val viaServer = MatrixPatterns.extractServerNameFromId(action.event.senderId).let { val viaServers = MatrixPatterns.extractServerNameFromId(action.event.senderId)
if (it.isNullOrBlank()) { ?.let { listOf(it) }
emptyList() .orEmpty()
} else {
listOf(it)
}
}
session.rx() session.rx()
.joinRoom(roomId, viaServers = viaServer) .joinRoom(roomId, viaServers = viaServers)
.map { roomId } .map { roomId }
.execute { .execute {
copy(tombstoneEventHandling = it) copy(tombstoneEventHandling = it)