Home: continue architecture rework. WIP

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt

@@ -18,6 +18,7 @@
 
 package im.vector.matrix.android.api.session.user
 
+import androidx.lifecycle.LiveData
 import im.vector.matrix.android.api.session.user.model.User
 
 /**
@@ -32,4 +33,11 @@ interface UserService {
      */
     fun getUser(userId: String): User?
 
+    /**
+     * Observe a live user from a userId
+     * @param userId the userId to look for.
+     * @return a Livedata of user with userId
+     */
+    fun observeUser(userId: String): LiveData<User?>
+
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.database.mapper
+
+import im.vector.matrix.android.api.session.user.model.User
+import im.vector.matrix.android.internal.database.model.UserEntity
+
+internal object UserMapper {
+
+    fun map(userEntity: UserEntity): User {
+        return User(
+                userEntity.userId,
+                userEntity.displayName,
+                userEntity.avatarUrl
+        )
+    }
+}
+
+internal fun UserEntity.asDomain(): User {
+    return UserMapper.map(this)
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt

@@ -231,6 +231,11 @@ internal class DefaultSession(override val sessionParams: SessionParams) : Sessi
         return userService.getUser(userId)
     }
 
+    override fun observeUser(userId: String): LiveData<User?> {
+        assert(isOpen)
+        return userService.observeUser(userId)
+    }
+
     // Private methods *****************************************************************************
 
     private fun assertMainThread() {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/DefaultUserService.kt

@@ -18,9 +18,13 @@
 
 package im.vector.matrix.android.internal.session.user
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.session.user.UserService
 import im.vector.matrix.android.api.session.user.model.User
+import im.vector.matrix.android.internal.database.RealmLiveData
+import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.model.UserEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.util.fetchCopied
@@ -29,12 +33,19 @@ internal class DefaultUserService(private val monarchy: Monarchy) : UserService
 
     override fun getUser(userId: String): User? {
         val userEntity = monarchy.fetchCopied { UserEntity.where(it, userId).findFirst() }
-                ?: return null
+                         ?: return null
 
-        return User(
-                userEntity.userId,
-                userEntity.displayName,
-                userEntity.avatarUrl
-        )
+        return userEntity.asDomain()
+    }
+
+    override fun observeUser(userId: String): LiveData<User?> {
+        val liveRealmData = RealmLiveData(monarchy.realmConfiguration) { realm ->
+            UserEntity.where(realm, userId)
+        }
+        return Transformations.map(liveRealmData) { results ->
+            results
+                    .map { it.asDomain() }
+                    .firstOrNull()
+        }
     }
 }