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

quick cleaning

This commit is contained in:
valere 2023-02-06 11:44:39 +01:00
parent 318a5a8fc1
commit 8b28e7ba54
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/verification/RustVerificationService.kt
View File

@ -149,7 +149,6 @@ internal class RustVerificationService @Inject constructor(
/** Check if the start event created new verification objects and dispatch updates */ /** Check if the start event created new verification objects and dispatch updates */
private suspend fun onStart(event: Event) { private suspend fun onStart(event: Event) {
if (event.unsignedData?.transactionId != null) return // remote echo if (event.unsignedData?.transactionId != null) return // remote echo
Timber.w("VALR onStart ${event.eventId}")
val sender = event.senderId ?: return val sender = event.senderId ?: return
val flowId = getFlowId(event) ?: return val flowId = getFlowId(event) ?: return

3
vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationViewModel.kt
View File

@ -157,7 +157,7 @@ class UserVerificationViewModel @AssistedInject constructor(
currentTransactionId == null && initialState.otherUserId == it.getRequest()?.otherUserId currentTransactionId == null && initialState.otherUserId == it.getRequest()?.otherUserId
} }
.onEach { .onEach {
Timber.w("VALR update event ${it.getRequest()} ") // Timber.w("VALR update event ${it.getRequest()} ")
it.getRequest()?.let { it.getRequest()?.let {
// Timber.w("VALR state updated request to $it") // Timber.w("VALR state updated request to $it")
setState { setState {
@ -167,7 +167,6 @@ class UserVerificationViewModel @AssistedInject constructor(
} }
} }
it.getTransaction()?.let { it.getTransaction()?.let {
Timber.w("VALR state updated transaction to $it")
val dClass = it.toDataClass() val dClass = it.toDataClass()
if (dClass != null) { if (dClass != null) {
setState { setState {

8
vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
View File

@ -138,15 +138,7 @@ class DevicesViewModel @AssistedInject constructor(
} }
.launchIn(viewModelScope) .launchIn(viewModelScope)
} }
session.flow().liveUserCryptoDevices(session.myUserId)
.onEach {
Timber.w("#VALR liveUserCryptoDevices: $it")
}
// session.flow().liveMyDevicesInfo()
// .onEach {
// Timber.w("#VALR liveMyDevicesInfo: $it")
// }.launchIn(viewModelScope)
combine( combine(
session.flow().liveUserCryptoDevices(session.myUserId), session.flow().liveUserCryptoDevices(session.myUserId),
session.flow().liveMyDevicesInfo() session.flow().liveMyDevicesInfo()