Fix empty verification bottom sheet #7130
Conversation
Ensure the User is retrieved from the network, or fallback to a default User object.
bmarty
requested review from
a team and
onurays
and removed request for
a team
| @@ -126,7 +128,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor( | |||
| } | |||
| } | |||
|
|
|||
| val userItem = session.getUser(initialState.otherUserId) | |||
There was a problem hiding this comment.
A null userItem was the source of the issue.
| @@ -160,7 +162,6 @@ class VerificationBottomSheetViewModel @AssistedInject constructor( | |||
|
|
|||
| setState { | |||
| copy( | |||
| otherUserMxItem = userItem?.toMatrixItem(), | |||
There was a problem hiding this comment.
is set in the constructor and updated with full data in fetchOtherUserProfile
| session.getUser(otherUserId)?.toMatrixItem()?.let { | ||
| setState { | ||
| copy( | ||
| otherUserMxItem = it |
There was a problem hiding this comment.
First change to set known data
| ?.let { | ||
| setState { | ||
| copy( | ||
| otherUserMxItem = it |
There was a problem hiding this comment.
second change to set up to date data, if possible (network available + API is returning data)
| @@ -216,12 +239,12 @@ class VerificationBottomSheetViewModel @AssistedInject constructor( | |||
|
|
|||
| private fun cancelAllPendingVerifications(state: VerificationBottomSheetViewState) { | |||
| session.cryptoService() | |||
| .verificationService().getExistingVerificationRequest(state.otherUserMxItem?.id ?: "", state.transactionId)?.let { | |||
There was a problem hiding this comment.
defaulting to "" everywhere was pretty bad...
|
Adding @BillCarsonFr as a reviewer, since this is code related to Crypto. |
|
Probably because of the move to worker for fetching users? |
bmarty
added
the
Z-NextRelease
I do not think so, because even all attempts was unsuccessful. With this theory, after a while it should work. I think this is not a regression, but an old bug. |
Thanks, let me have a look on it. |
|
SonarCloud Quality Gate failed. |
Type of change
Content
When the User with
otherUserIdwas not known by the SDK, it was not possible to verify them.First commit 6d2a9ec is the first part of the fix.
otherUserIdwas null because retrieved from a nullMatrixItem.Second commit 92d7391 ensure that the
MatrixItemcannot be null.The 2nd commit should be sufficient to fix the issue, but the first commit make thing clearer IMHO.
Motivation and context
Be able to Verify every users.
Screenshots / GIFs
Tests
Tested devices
Checklist