Clean code after review

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt

@@ -33,7 +33,7 @@ data class TimelineEvent(
         val localId: Long,
         val displayIndex: Int,
         val senderName: String?,
-        val isUniqueDisplayName: Boolean = false,
+        val isUniqueDisplayName: Boolean,
         val senderAvatar: String?,
         val sendState: SendState,
         val annotations: EventAnnotationsSummary? = null

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt

@@ -29,9 +29,9 @@ import retrofit2.Call
 import timber.log.Timber
 import java.io.IOException
 
-internal suspend inline fun <DATA : Any> executeRequest(block: Request<DATA>.() -> Unit) = Request<DATA>().apply(block).execute()
+internal suspend inline fun <DATA> executeRequest(block: Request<DATA>.() -> Unit) = Request<DATA>().apply(block).execute()
 
-internal class Request<DATA : Any> {
+internal class Request<DATA> {
 
     private val moshi: Moshi = MoshiProvider.providesMoshi()
     lateinit var apiCall: Call<DATA>

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt

@@ -23,19 +23,19 @@ import retrofit2.*
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-suspend fun <T : Any> Call<T>.awaitResponse(): Response<T> {
+suspend fun <T> Call<T>.awaitResponse(): Response<T> {
-  return suspendCancellableCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
-    continuation.invokeOnCancellation {
+        continuation.invokeOnCancellation {
-      cancel()
+            cancel()
-    }
+        }
-    enqueue(object : Callback<T> {
+        enqueue(object : Callback<T> {
-      override fun onResponse(call: Call<T>, response: Response<T>) {
+            override fun onResponse(call: Call<T>, response: Response<T>) {
-        continuation.resume(response)
+                continuation.resume(response)
-      }
+            }
 
-      override fun onFailure(call: Call<T>, t: Throwable) {
+            override fun onFailure(call: Call<T>, t: Throwable) {
-        continuation.resumeWithException(t)
+                continuation.resumeWithException(t)
-      }
+            }
-    })
+        })
-  }
+    }
 }

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

@@ -20,8 +20,6 @@ import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.user.DefaultUpdateUserTask
-import im.vector.matrix.android.internal.session.user.UpdateUserTask
 import retrofit2.Retrofit
 
 @Module

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

@@ -1,44 +0,0 @@
-/*
- * 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.session.user
-
-import arrow.core.Try
-import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.room.membership.RoomMembers
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.tryTransactionSync
-import javax.inject.Inject
-
-internal interface UpdateUserTask : Task<UpdateUserTask.Params, Unit> {
-
-    data class Params(val eventIds: List<String>)
-
-}
-
-internal class DefaultUpdateUserTask @Inject constructor(private val monarchy: Monarchy) : UpdateUserTask {
-
-    override suspend fun execute(params: UpdateUserTask.Params): Try<Unit> {
-        return Try.just(Unit)
-    }
-}

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

@@ -1,67 +0,0 @@
-/*
- * 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.session.user
-
-import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.database.RealmLiveEntityObserver
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.database.query.types
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.TaskThread
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.tryTransactionAsync
-import im.vector.matrix.android.internal.util.tryTransactionSync
-import io.realm.OrderedCollectionChangeSet
-import io.realm.RealmConfiguration
-import io.realm.RealmResults
-import io.realm.Sort
-import javax.inject.Inject
-
-internal class UserEntityUpdater @Inject constructor(@SessionDatabase realmConfiguration: RealmConfiguration,
-                                                     private val monarchy: Monarchy,
-                                                     private val updateUserTask: UpdateUserTask,
-                                                     private val taskExecutor: TaskExecutor)
-    : RealmLiveEntityObserver<EventEntity>(realmConfiguration) {
-
-    override val query = Monarchy.Query<EventEntity> {
-        EventEntity
-                .types(it, listOf(EventType.STATE_ROOM_MEMBER))
-                .sort(EventEntityFields.STATE_INDEX, Sort.DESCENDING)
-                .distinct(EventEntityFields.STATE_KEY)
-    }
-
-    override fun onChange(results: RealmResults<EventEntity>, changeSet: OrderedCollectionChangeSet) {
-        monarchy.tryTransactionSync { realm ->
-            val userEntities = ArrayList<UserEntity>(changeSet.insertions.size)
-            for (insertion in changeSet.insertions) {
-                val roomMemberEvent = results[insertion] ?: continue
-                val roomMemberTimelineEvent = roomMemberEvent.timelineEventEntity?.firstOrNull()
-                                              ?: continue
-                val userEntity = UserEntity(roomMemberEvent.stateKey
-                                            ?: "", roomMemberTimelineEvent.senderName ?: "",
-                                            roomMemberTimelineEvent.senderAvatar ?: "")
-                userEntities.add(userEntity)
-            }
-            realm.insertOrUpdate(userEntities)
-        }
-    }
-
-}

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

@@ -26,7 +26,4 @@ internal abstract class UserModule {
     @Binds
     abstract fun bindUserService(userService: DefaultUserService): UserService
 
-    @Binds
-    abstract fun bindUpdateUserTask(updateUserTask: DefaultUpdateUserTask): UpdateUserTask
-
 }