From 84c1874284ef18189fd2c0707154fce9d9b8f14a Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 24 Jun 2022 09:38:47 +0200
Subject: [PATCH] simplify call chain

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../java/com/nextcloud/talk/users/UserManager.kt  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
index ba3c0e3c9..ea5b3251d 100644
--- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
+++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
@@ -45,14 +45,13 @@ class UserManager internal constructor(private val userRepository: UsersReposito
         val results = userRepository.getUsersNotScheduledForDeletion()
 
         return results.map { users ->
-            var result: User? = null
-            if (users.isNotEmpty()) {
-                val user = users[0]
-                user.current = true
-                userRepository.updateUser(user)
-                result = user
-            }
-            result
+            users
+                .firstOrNull()
+                ?.apply {
+                    current = true
+                }?.also { user ->
+                    userRepository.updateUser(user)
+                }
         }
     }