diff --git a/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt b/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt index ed7a0ae16..1d2f30109 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt @@ -101,8 +101,12 @@ class SimplexApp: Application(), LifecycleEventObserver { isAppOnForeground = true if (chatModel.chatRunning.value == true) { kotlin.runCatching { + val currentUserId = chatModel.currentUser.value?.userId val chats = chatController.apiGetChats() - chatModel.updateChats(chats) + /** Active user can be changed in background while [ChatController.apiGetChats] is executing */ + if (chatModel.currentUser.value?.userId == currentUserId) { + chatModel.updateChats(chats) + } }.onFailure { Log.e(TAG, it.stackTraceToString()) } } }