From b69f21580a70442b474da02252fa0278e0f7cd5b Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 28 Jan 2025 15:57:41 +0100 Subject: [PATCH] self heal if multiple current users exist usersDao.getActiveUser() will return only one current users even if multiple exist for whatever reason. By executing setUserAsActiveWithId(it.id) with the same user, it is made sure all other users current status is set to 0. This change won't fix the root cause if multiple users are set to current, but it will make sure the state is fixed as soon as there is a query to get the active user. In fact, this change might also make it harder to find the root cause because debugging may be more difficult! When searching for the root cause, always keep this in mind and maybe revert the change. Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/data/user/UsersRepositoryImpl.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt index 557860763..66b51ee44 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt @@ -7,6 +7,7 @@ */ package com.nextcloud.talk.data.user +import android.util.Log import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.models.json.push.PushConfigurationState import io.reactivex.Maybe @@ -17,7 +18,12 @@ import io.reactivex.Single class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository { override fun getActiveUser(): Maybe { - return usersDao.getActiveUser().map { UserMapper.toModel(it) } + val user = usersDao.getActiveUser() + .map { + setUserAsActiveWithId(it.id) + UserMapper.toModel(it)!! + } + return user } override fun getActiveUserObservable(): Observable { @@ -62,6 +68,7 @@ class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository { override fun setUserAsActiveWithId(id: Long): Single { val amountUpdated = usersDao.setUserAsActiveWithId(id) + Log.d(TAG, "setUserAsActiveWithId. amountUpdated: $amountUpdated") return if (amountUpdated > 0) { Single.just(true) } else { @@ -76,4 +83,8 @@ class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository { override fun updatePushState(id: Long, state: PushConfigurationState): Single { return usersDao.updatePushState(id, state) } + + companion object { + private val TAG = UsersRepositoryImpl::class.simpleName + } }