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

Fix / NPE Optional#get instead of getOrNull

This commit is contained in:
Valere 2020-04-30 11:11:11 +02:00
parent 6ea38c7eb0
commit 5840248ffa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
View File

@ -64,8 +64,8 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
session.rx().liveCrossSigningInfo(session.myUserId) session.rx().liveCrossSigningInfo(session.myUserId)
.execute { .execute {
copy( copy(
hasAccountCrossSigning = it.invoke()?.get() != null, hasAccountCrossSigning = it.invoke()?.getOrNull() != null,
accountCrossSigningIsTrusted = it.invoke()?.get()?.isTrusted() == true accountCrossSigningIsTrusted = it.invoke()?.getOrNull()?.isTrusted() == true
) )
} }

4
vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
View File

@ -93,8 +93,8 @@ class DevicesViewModel @AssistedInject constructor(
session.rx().liveCrossSigningInfo(session.myUserId) session.rx().liveCrossSigningInfo(session.myUserId)
.execute { .execute {
copy( copy(
hasAccountCrossSigning = it.invoke()?.get() != null, hasAccountCrossSigning = it.invoke()?.getOrNull() != null,
accountCrossSigningIsTrusted = it.invoke()?.get()?.isTrusted() == true accountCrossSigningIsTrusted = it.invoke()?.getOrNull()?.isTrusted() == true
) )
} }