From 27bbd18a7461d0a3cd5838367cb98b7e222a0782 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Oct 2022 12:54:24 +0200 Subject: [PATCH] Run `./gradlew ktlintFormat` --- .../android/sdk/api/session/room/timeline/TimelineEvent.kt | 1 - .../matrix/android/sdk/internal/database/RealmInstance.kt | 2 -- .../sdk/internal/database/RealmLiveEntityObserver.kt | 1 - .../android/sdk/internal/database/model/EventEntity.kt | 2 +- .../android/sdk/internal/database/model/PushRulesEntity.kt | 1 - .../android/sdk/internal/database/model/PusherEntity.kt | 3 +-- .../database/query/HomeServerCapabilitiesQueries.kt | 1 - .../android/sdk/internal/database/query/PushersQueries.kt | 1 - .../sdk/internal/database/query/ReadMarkerEntityQueries.kt | 1 - .../internal/database/query/ThreadSummaryEntityQueries.kt | 1 - .../internal/database/query/TimelineEventEntityQueries.kt | 1 - .../android/sdk/internal/query/QueryStringValueProcessor.kt | 1 - .../session/integrationmanager/IntegrationManager.kt | 1 - .../internal/session/pushrules/DefaultPushRuleService.kt | 1 - .../session/room/accountdata/RoomAccountDataDataSource.kt | 2 -- .../sdk/internal/session/room/create/CreateLocalRoomTask.kt | 1 - .../room/relation/threads/FetchThreadTimelineTask.kt | 1 - .../internal/session/room/summary/RoomSummaryDataSource.kt | 2 -- .../internal/session/room/timeline/LoadTimelineStrategy.kt | 1 - .../sdk/internal/session/room/timeline/TimelineChunk.kt | 2 -- .../session/sync/handler/UserAccountDataSyncHandler.kt | 6 +++--- .../android/sdk/internal/session/user/UserDataSource.kt | 1 - .../session/user/accountdata/UserAccountDataDataSource.kt | 2 +- 23 files changed, 6 insertions(+), 30 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt index 6d0c2e671b..d391abf1e6 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt @@ -16,7 +16,6 @@ package org.matrix.android.sdk.api.session.room.timeline -import io.realm.kotlin.types.ObjectId import org.matrix.android.sdk.BuildConfig import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.session.events.model.Event diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt index c9e90c4f21..1a48ec721a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt @@ -20,12 +20,10 @@ import kotlinx.coroutines.async import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flatMapConcat import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext -import org.matrix.android.sdk.R import org.matrix.android.sdk.api.util.Optional import org.matrix.android.sdk.internal.database.pagedlist.RealmTiledDataSource diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt index d5f63feed5..9c6b4f801e 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt @@ -21,7 +21,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancelChildren -import org.matrix.android.sdk.api.MatrixCoroutineDispatchers import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.SessionLifecycleObserver diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt index f363572a6d..24b7ede329 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt @@ -83,7 +83,7 @@ internal class EventEntity : RealmObject { companion object fun setDecryptionResult(result: MXEventDecryptionResult) { - //assertIsManaged() + // assertIsManaged() val decryptionResult = OlmDecryptionResult( payload = result.clearEvent, senderKey = result.senderCurve25519Key, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt index 7fc1e060c7..6e13a6638b 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt @@ -42,4 +42,3 @@ internal fun MutableRealm.deleteOnCascade(pushRulesEntity: PushRulesEntity) { pushRulesEntity.pushRules.clearWith { deleteOnCascade(it) } delete(pushRulesEntity) } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt index db5d1ff1b6..13f5eb3681 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt @@ -55,8 +55,7 @@ internal class PusherEntity : RealmObject { companion object } -internal fun MutableRealm.deleteOnCascade(pusherEntity: PusherEntity){ +internal fun MutableRealm.deleteOnCascade(pusherEntity: PusherEntity) { pusherEntity.data?.also { delete(it) } delete(pusherEntity) } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt index 4540cff922..b314d99694 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt @@ -37,4 +37,3 @@ internal fun HomeServerCapabilitiesEntity.Companion.getOrCreate(realm: MutableRe internal fun HomeServerCapabilitiesEntity.Companion.create(realm: MutableRealm): HomeServerCapabilitiesEntity { return realm.copyToRealm(HomeServerCapabilitiesEntity()) } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt index 340ad09a18..9891717cf9 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt @@ -41,4 +41,3 @@ internal fun PushRulesEntity.Companion.where( .query("scope == $0", scope) .query("kindStr == $0", kind.name) } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt index 0990a9fbca..255809053e 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt @@ -36,4 +36,3 @@ internal fun ReadMarkerEntity.Companion.create(realm: MutableRealm, roomId: Stri } return realm.copyToRealm(readMarkerEntity) } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt index 5090f9342e..a9d83eef0a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt @@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.database.query import io.realm.kotlin.MutableRealm import io.realm.kotlin.TypedRealm import io.realm.kotlin.query.RealmQuery -import io.realm.kotlin.types.RealmList import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity internal fun ThreadSummaryEntity.Companion.where(realm: TypedRealm, roomId: String): RealmQuery { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt index cb113eee77..244a695e15 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt @@ -87,7 +87,6 @@ internal fun TimelineEventEntity.Companion.latestEvent( includesSending: Boolean, filters: TimelineEventFilters = TimelineEventFilters() ): TimelineEventEntity? { - val roomEntity = RoomEntity.where(realm, roomId).first().find() ?: return null val sendingTimelineEvents = roomEntity.sendingTimelineEvents val liveEvents = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId)?.timelineEvents.orEmpty() diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt index 2dfc07c2c5..35c30474a0 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt @@ -57,4 +57,3 @@ internal class QueryStringValueProcessor @Inject constructor( } } } - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt index 34a7068d98..033106b3be 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt @@ -252,7 +252,6 @@ internal class IntegrationManager @Inject constructor( } private fun observeWellknownConfig() { - fun mapConfig(entity: WellknownIntegrationManagerConfigEntity): IntegrationManagerConfig { return IntegrationManagerConfig(entity.uiUrl, entity.apiUrl, IntegrationManagerConfig.Kind.HOMESERVER) } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt index 893504d2fd..be95b55fd5 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt @@ -156,7 +156,6 @@ internal class DefaultPushRuleService @Inject constructor( } override fun getKeywords(): LiveData> { - fun map(pushRulesEntity: PushRulesEntity): List { return pushRulesEntity.pushRules .map(PushRuleEntity::ruleId) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt index 552d3d036a..b1d3306770 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt @@ -22,12 +22,10 @@ import androidx.lifecycle.Transformations import androidx.lifecycle.asLiveData import io.realm.kotlin.TypedRealm import io.realm.kotlin.query.RealmQuery -import kotlinx.coroutines.flow.map import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataEvent import org.matrix.android.sdk.api.util.Optional import org.matrix.android.sdk.api.util.toOptional import org.matrix.android.sdk.internal.database.RealmInstance -import org.matrix.android.sdk.internal.database.RealmObjectMapper import org.matrix.android.sdk.internal.database.andIf import org.matrix.android.sdk.internal.database.mapper.AccountDataMapper import org.matrix.android.sdk.internal.database.model.RoomEntity diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt index e75694cf7d..2cd8c68e9c 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt @@ -17,7 +17,6 @@ package org.matrix.android.sdk.internal.session.room.create import io.realm.kotlin.MutableRealm -import io.realm.kotlin.types.ObjectId import kotlinx.coroutines.TimeoutCancellationException import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.tryOrNull diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt index 5635f56c24..bf6b757485 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt @@ -118,7 +118,6 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor( val hasReachEnd = response.nextBatch == null realmInstance.write { - val threadChunk = ChunkEntity.findLastForwardChunkOfThread(this, params.roomId, params.rootThreadEventId) ?: run { return@write diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt index c01b6977db..25f9d10723 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt @@ -25,7 +25,6 @@ import androidx.paging.PagedList import io.realm.kotlin.TypedRealm import io.realm.kotlin.query.RealmQuery import io.realm.kotlin.query.sum -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.map import org.matrix.android.sdk.api.query.QueryStringValue import org.matrix.android.sdk.api.query.RoomCategoryFilter @@ -186,7 +185,6 @@ internal class RoomSummaryDataSource @Inject constructor( pagedListConfig: PagedList.Config, sortOrder: RoomSortOrder, ): UpdatableLivePageResult { - val boundaries = MutableLiveData(ResultBoundaries()) val boundaryCallback = object : PagedList.BoundaryCallback() { override fun onItemAtEndLoaded(itemAtEnd: RoomSummary) { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt index 4a42210727..55aa296007 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt @@ -114,7 +114,6 @@ internal class LoadTimelineStrategy constructor( private var timelineChunk: TimelineChunk? = null private suspend fun onChunkResultsChanged(resultsChange: ResultsChange) { - suspend fun onUpdates(updatedResults: UpdatedResults) { val shouldRebuildChunk = updatedResults.insertions.isNotEmpty() if (shouldRebuildChunk) { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt index 300f33c9b3..3de6c63dbc 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt @@ -464,7 +464,6 @@ internal class TimelineChunk( } private fun handleChunkObjectChange(chunkChanged: ObjectChange) { - fun onChunkUpdated(updatedObject: UpdatedObject) { Timber.v("on chunk (${chunkEntity.identifier()}) changed: ${updatedObject.changedFields.joinToString(",")}") if (updatedObject.isFieldChanged("isLastForward")) { @@ -499,7 +498,6 @@ internal class TimelineChunk( * */ private fun handleDatabaseChangeSet(resultChanges: ResultsChange) { - fun validateInsertion(range: ListChangeSet.Range, results: RealmResults): Boolean { // Insertion can only happen from LastForward chunk after a sync. if (isLastForward.get()) { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt index 4de96d68f9..8efa9510b5 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt @@ -127,7 +127,7 @@ internal class UserAccountDataSyncHandler @Inject constructor( .query(PushRulesEntity::class) .find() .forEach { - //it.deleteOnCascade() + // it.deleteOnCascade() } // Save only global rules for the moment @@ -228,8 +228,8 @@ internal class UserAccountDataSyncHandler @Inject constructor( TimelineEventEntity.findAllFrom(realm, userIds) .also { Timber.d("Deleting ${it.size} TimelineEventEntity from ignored users") } .forEach { - //TODO DELETE ON CASCADE - //it.deleteOnCascade(true) + // TODO DELETE ON CASCADE + // it.deleteOnCascade(true) } // Handle the case when some users are unignored from another session diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt index 5fb3232a47..9a2b3172ec 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt @@ -85,7 +85,6 @@ internal class UserDataSource @Inject constructor( } fun getIgnoredUsersLive(): LiveData> { - fun mapper(ignoredUserEntity: IgnoredUserEntity): User { return getUser(ignoredUserEntity.userId) ?: User(userId = ignoredUserEntity.userId) } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt index 2f517f5805..c3bb3d80d4 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt @@ -53,7 +53,7 @@ internal class UserAccountDataDataSource @Inject constructor( } fun getLiveAccountDataEvents(types: Set): LiveData> { - return realmInstance.queryList(accountDataMapper::map){ + return realmInstance.queryList(accountDataMapper::map) { accountDataEventsQuery(it, types) }.asLiveData() }