filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments. 

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
This commit is contained in:
Dominic Fischer 2019-10-21 22:29:36 +01:00
parent e28e2dadb9
commit d071324694
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
View File

@ -63,7 +63,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
private fun canRetryKeysDownload(userId: String): Boolean {
var res = false
if (userId.isNotEmpty() && userId.contains(":")) {
if (':' in userId) {
try {
synchronized(notReadyToRetryHS) {
res = !notReadyToRetryHS.contains(userId.substring(userId.lastIndexOf(":") + 1))

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequestManager.kt
View File

@ -95,7 +95,7 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
continue
}
if (deviceId == credentials.deviceId && credentials.userId == userId) {
if (credentials.deviceId == deviceId && credentials.userId == userId) {
Timber.v("## processReceivedRoomKeyRequests() : oneself device - ignored")
cryptoStore.deleteIncomingRoomKeyRequest(request)
continue

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt
View File

@ -78,9 +78,10 @@ internal class TimelineEventDecryptor(
existingRequests.add(eventId)
}
synchronized(unknownSessionsFailure) {
unknownSessionsFailure.values.forEach {
for (it in unknownSessionsFailure.values) {
if (eventId in it) {
Timber.d("Skip Decryption request for event $eventId, unknown session")
break
}
}
}

2
vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
View File

@ -132,5 +132,5 @@ fun getSizeOfFiles(context: Context, root: File): Int {
Timber.v("Get size of ${it.absolutePath}")
true
}
.sumBy { root.length().toInt() }
.sumBy { it.length().toInt() }
}

2
vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
View File

@ -148,7 +148,7 @@ class RoomListViewModel @AssistedInject constructor(@Assisted initialState: Room
setState {
copy(
joiningRoomsIds = joiningRoomsIds - roomId,
joiningErrorRoomsIds = joiningErrorRoomsIds - roomId
joiningErrorRoomsIds = joiningErrorRoomsIds + roomId
)
}
}