Merge pull request #558 from matrix-org/yostyle/bugfix_user_preferenc…

…e_crash Set user id before storing it
matrix-org · Sep 22, 2020 · 3d3c42c · 3d3c42c
2 parents 38fc616 + 1def84d
commit 3d3c42c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,7 +8,7 @@ Improvements:
  -
 
 Bugfix:
- -
+ - Fix a crash when it checks user presence (related to matrix-org/synapse#7606).
 
 API Change:
  -

diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java
@@ -547,6 +547,7 @@ public void onSuccess(User user) {
                     currentUser.lastActiveAgo = user.lastActiveAgo;
                 } else {
                     currentUser = user;
+                    currentUser.user_id = userId;
                 }
 
                 currentUser.setLatestPresenceTs(System.currentTimeMillis());