Skip to content

Commit 46f5115

Browse files
ganfraganfra
committed
Pinned events : clean up code
1 parent 66e06d7 commit 46f5115

File tree

6 files changed

+4
-22
lines changed

6 files changed

+4
-22
lines changed

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ private fun buildActions(
145145
if (canRedact && timelineItem.content is TimelineItemPollContent && !timelineItem.content.isEnded) {
146146
add(TimelineItemAction.EndPoll)
147147
}
148-
// TODO: handle unpin
149148
val canPinUnpin = isPinnedEventsEnabled && usersEventPermissions.canPinUnpin && timelineItem.isRemote
150149
if (canPinUnpin) {
151150
if (isEventPinned) {

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ sealed class TimelineItemAction(
4040
data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, CompoundDrawables.ic_compound_chat_problem, destructive = true)
4141
data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CompoundDrawables.ic_compound_polls_end)
4242
data object Pin : TimelineItemAction(CommonStrings.action_pin, CompoundDrawables.ic_compound_pin)
43-
//TODO use the Unpin compound icon when available.
43+
44+
// TODO use the Unpin compound icon when available.
4445
data object Unpin : TimelineItemAction(CommonStrings.action_unpin, CompoundDrawables.ic_compound_pin)
4546
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package io.element.android.features.messages.impl.timeline.model
1818

1919
import androidx.compose.runtime.Immutable
2020
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
21-
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
2221
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
2322
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
2423
import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
@@ -96,7 +95,6 @@ sealed interface TimelineItem {
9695
val isSticker: Boolean = content is TimelineItemStickerContent
9796

9897
val isRemote = eventId != null
99-
10098
}
10199

102100
@Immutable

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ class MessagesPresenterTest {
156156
canUserJoinCallResult = { Result.success(true) },
157157
typingNoticeResult = { Result.success(Unit) },
158158
canUserPinUnpinResult = { Result.success(true) },
159-
160159
)
161160
assertThat(room.markAsReadCalls).isEmpty()
162161
val presenter = createMessagesPresenter(matrixRoom = room)
@@ -178,7 +177,6 @@ class MessagesPresenterTest {
178177
canRedactOtherResult = { Result.success(true) },
179178
typingNoticeResult = { Result.success(Unit) },
180179
canUserPinUnpinResult = { Result.success(true) },
181-
182180
).apply {
183181
givenRoomInfo(aRoomInfo(hasRoomCall = true))
184182
}
@@ -208,7 +206,6 @@ class MessagesPresenterTest {
208206
canUserJoinCallResult = { Result.success(true) },
209207
typingNoticeResult = { Result.success(Unit) },
210208
canUserPinUnpinResult = { Result.success(true) },
211-
212209
)
213210
val presenter = createMessagesPresenter(matrixRoom = room, coroutineDispatchers = coroutineDispatchers)
214211
moleculeFlow(RecompositionMode.Immediate) {
@@ -247,7 +244,6 @@ class MessagesPresenterTest {
247244
canUserJoinCallResult = { Result.success(true) },
248245
typingNoticeResult = { Result.success(Unit) },
249246
canUserPinUnpinResult = { Result.success(true) },
250-
251247
)
252248
val presenter = createMessagesPresenter(matrixRoom = room, coroutineDispatchers = coroutineDispatchers)
253249
moleculeFlow(RecompositionMode.Immediate) {
@@ -307,7 +303,6 @@ class MessagesPresenterTest {
307303
canUserJoinCallResult = { Result.success(true) },
308304
typingNoticeResult = { Result.success(Unit) },
309305
canUserPinUnpinResult = { Result.success(true) },
310-
311306
)
312307
val presenter = createMessagesPresenter(
313308
clipboardHelper = clipboardHelper,
@@ -498,7 +493,6 @@ class MessagesPresenterTest {
498493
canUserJoinCallResult = { Result.success(true) },
499494
typingNoticeResult = { Result.success(Unit) },
500495
canUserPinUnpinResult = { Result.success(true) },
501-
502496
)
503497

504498
val redactEventLambda = lambdaRecorder { _: EventId?, _: TransactionId?, _: String? -> Result.success(true) }
@@ -574,7 +568,6 @@ class MessagesPresenterTest {
574568
canUserJoinCallResult = { Result.success(true) },
575569
typingNoticeResult = { Result.success(Unit) },
576570
canUserPinUnpinResult = { Result.success(true) },
577-
578571
)
579572
val presenter = createMessagesPresenter(matrixRoom = room)
580573
moleculeFlow(RecompositionMode.Immediate) {
@@ -611,7 +604,6 @@ class MessagesPresenterTest {
611604
canUserJoinCallResult = { Result.success(true) },
612605
typingNoticeResult = { Result.success(Unit) },
613606
canUserPinUnpinResult = { Result.success(true) },
614-
615607
)
616608
val presenter = createMessagesPresenter(matrixRoom = room)
617609
moleculeFlow(RecompositionMode.Immediate) {
@@ -637,7 +629,6 @@ class MessagesPresenterTest {
637629
canUserJoinCallResult = { Result.success(true) },
638630
typingNoticeResult = { Result.success(Unit) },
639631
canUserPinUnpinResult = { Result.success(true) },
640-
641632
)
642633
val presenter = createMessagesPresenter(matrixRoom = room)
643634
moleculeFlow(RecompositionMode.Immediate) {
@@ -663,7 +654,6 @@ class MessagesPresenterTest {
663654
canUserJoinCallResult = { Result.success(true) },
664655
typingNoticeResult = { Result.success(Unit) },
665656
canUserPinUnpinResult = { Result.success(true) },
666-
667657
)
668658
room.givenRoomMembersState(
669659
MatrixRoomMembersState.Ready(
@@ -700,7 +690,6 @@ class MessagesPresenterTest {
700690
canUserJoinCallResult = { Result.success(true) },
701691
typingNoticeResult = { Result.success(Unit) },
702692
canUserPinUnpinResult = { Result.success(true) },
703-
704693
)
705694
room.givenRoomMembersState(
706695
MatrixRoomMembersState.Error(
@@ -738,7 +727,6 @@ class MessagesPresenterTest {
738727
canUserJoinCallResult = { Result.success(true) },
739728
typingNoticeResult = { Result.success(Unit) },
740729
canUserPinUnpinResult = { Result.success(true) },
741-
742730
)
743731
room.givenRoomMembersState(MatrixRoomMembersState.Unknown)
744732
val presenter = createMessagesPresenter(matrixRoom = room)
@@ -766,7 +754,6 @@ class MessagesPresenterTest {
766754
canUserJoinCallResult = { Result.success(true) },
767755
typingNoticeResult = { Result.success(Unit) },
768756
canUserPinUnpinResult = { Result.success(true) },
769-
770757
)
771758
room.givenRoomMembersState(
772759
MatrixRoomMembersState.Ready(
@@ -808,7 +795,6 @@ class MessagesPresenterTest {
808795
canUserJoinCallResult = { Result.success(true) },
809796
typingNoticeResult = { Result.success(Unit) },
810797
canUserPinUnpinResult = { Result.success(true) },
811-
812798
)
813799
val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
814800
moleculeFlow(RecompositionMode.Immediate) {
@@ -834,7 +820,6 @@ class MessagesPresenterTest {
834820
canUserJoinCallResult = { Result.success(true) },
835821
typingNoticeResult = { Result.success(Unit) },
836822
canUserPinUnpinResult = { Result.success(true) },
837-
838823
)
839824
val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
840825
moleculeFlow(RecompositionMode.Immediate) {

‎libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,5 +187,4 @@ interface Timeline : AutoCloseable {
187187
* pinned
188188
*/
189189
suspend fun unpinEvent(eventId: EventId): Result<Boolean>
190-
191190
}

‎libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,12 @@ class FakeTimeline(
372372

373373
override suspend fun loadReplyDetails(eventId: EventId) = loadReplyDetailsLambda(eventId)
374374

375-
var pinEventLambda: (eventId: EventId) -> Result<Boolean> = { lambdaError()}
375+
var pinEventLambda: (eventId: EventId) -> Result<Boolean> = { lambdaError() }
376376
override suspend fun pinEvent(eventId: EventId): Result<Boolean> {
377377
return pinEventLambda(eventId)
378378
}
379379

380-
var unpinEventLambda: (eventId: EventId) -> Result<Boolean> = { lambdaError()}
380+
var unpinEventLambda: (eventId: EventId) -> Result<Boolean> = { lambdaError() }
381381
override suspend fun unpinEvent(eventId: EventId): Result<Boolean> {
382382
return unpinEventLambda(eventId)
383383
}

0 commit comments

Comments
 (0)