From 581f71e89d53b9ddedd31a27b9bee02de9c0fbc8 Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Thu, 23 Dec 2021 17:22:27 +0200 Subject: [PATCH] Remove unused code --- .../room/relation/DefaultRelationService.kt | 68 +------------------ .../session/room/timeline/DefaultTimeline.kt | 5 -- .../home/room/detail/RoomDetailViewModel.kt | 11 --- 3 files changed, 1 insertion(+), 83 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt index 02af20de23..2a6950d742 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt @@ -220,74 +220,8 @@ internal class DefaultRelationService @AssistedInject constructor( return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId)) } - private fun decryptIfNeeded(event: Event, roomId: String) { - try { - // Event from sync does not have roomId, so add it to the event first - val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "") - event.mxDecryptionResult = OlmDecryptionResult( - payload = result.clearEvent, - senderKey = result.senderCurve25519Key, - keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) }, - forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain - ) - } catch (e: MXCryptoError) { - if (e is MXCryptoError.Base) { - event.mCryptoError = e.errorType - event.mCryptoErrorReason = e.technicalMessage.takeIf { it.isNotEmpty() } ?: e.detailedErrorDescription - } - } - } - override suspend fun fetchThreadTimeline(rootThreadEventId: String): List { - val results = fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(roomId, rootThreadEventId)) - var counter = 0 -// -// monarchy -// .awaitTransaction { realm -> -// val chunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId) -// -// val optimizedThreadSummaryMap = hashMapOf() -// for (event in results.reversed()) { -// if (event.eventId == null || event.senderId == null || event.type == null) { -// continue -// } -// -// // skip if event already exists -// if (EventEntity.where(realm, event.eventId).findFirst() != null) { -// counter++ -// continue -// } -// -// if (event.isEncrypted()) { -// decryptIfNeeded(event, roomId) -// } -// -// val ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it } -// val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, EventInsertType.INCREMENTAL_SYNC) -// if (event.stateKey != null) { -// CurrentStateEventEntity.getOrCreate(realm, roomId, event.stateKey, event.type).apply { -// eventId = event.eventId -// root = eventEntity -// } -// } -// chunk?.addTimelineEvent(roomId, eventEntity, PaginationDirection.FORWARDS) -// eventEntity.rootThreadEventId?.let { -// // This is a thread event -// optimizedThreadSummaryMap[it] = eventEntity -// } ?: run { -// // This is a normal event or a root thread one -// optimizedThreadSummaryMap[eventEntity.eventId] = eventEntity -// } -// } -// -// optimizedThreadSummaryMap.updateThreadSummaryIfNeeded( -// roomId = roomId, -// realm = realm, -// currentUserId = userId) -// } - Timber.i("----> size: ${results.size} | skipped: $counter | threads: ${results.map{ it.eventId}}") - - return results + return fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(roomId, rootThreadEventId)) } /** diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt index a100c4635a..72a922dc88 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt @@ -177,7 +177,6 @@ internal class DefaultTimeline( val threadTimelineEvents = TimelineEventEntity .whereRoomId(realm, roomId = roomId) .equalTo(TimelineEventEntityFields.CHUNK.IS_LAST_FORWARD, true) -// .`in`("${TimelineEventEntityFields.CHUNK.TIMELINE_EVENTS}.${TimelineEventEntityFields.EVENT_ID}", arrayOf(it)) .beginGroup() .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, it) .or() @@ -192,8 +191,6 @@ internal class DefaultTimeline( threadTimelineEvents } } ?: buildEventQuery(realm).sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING).findAll() - if (isFromThreadTimeline) - Timber.i("----> timelineEvents.size: ${timelineEvents.size}") timelineEvents.addChangeListener(eventsChangeListener) handleInitialLoad() @@ -343,8 +340,6 @@ internal class DefaultTimeline( val lastCacheEvent = results.lastOrNull() val firstCacheEvent = results.firstOrNull() val chunkEntity = getLiveChunk() - if (isFromThreadTimeline) - Timber.i("----> results.size: ${results.size} | contains root thread ${results.map { it.eventId }.contains(rootThreadEventId)}") updateState(Timeline.Direction.FORWARDS) { state -> state.copy( diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt index 552a7e63f6..45389fefc8 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt @@ -308,17 +308,6 @@ class RoomDetailViewModel @AssistedInject constructor( } } -// /** -// * Fetch all the thread replies for the current thread -// */ -// private fun fetchThreadTimeline() { -// initialState.rootThreadEventId?.let { -// viewModelScope.launch(Dispatchers.IO) { -// room.fetchThreadTimeline(it) -// } -// } -// } - fun getOtherUserIds() = room.roomSummary()?.otherMemberIds fun getRoomSummary() = room.roomSummary()