From 459be4ced1b3fa358d8e2f902cb53f69f5df2291 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 29 Feb 2020 23:07:30 -0500 Subject: [PATCH] Refactor code for displaying SIM index in message list --- .../moez/QKSMS/feature/compose/MessagesAdapter.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index d608308d..c27fa4f7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -223,20 +223,15 @@ class MessagesAdapter @Inject constructor( // Bind the timestamp val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0)) - val simIndex = subs.takeIf { it.size > 1 }?.indexOfFirst { it.subscriptionId == message.subId } ?: -1 + val subscription = subs.find { sub -> sub.subscriptionId == message.subId } holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date) - if (simIndex != -1){ - holder.simIndex.text = "${subs[simIndex].simSlotIndex + 1} - " + subs[simIndex].displayName - } else { - holder.simIndex.text = "${simIndex + 1}" - } - + holder.simIndex.text = subscription?.let { sub -> sub.simSlotIndex + 1 }?.toString() holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD - || message.subId != previous?.subId && simIndex != -1) - holder.sim.setVisible(message.subId != previous?.subId && simIndex != -1) - holder.simIndex.setVisible(message.subId != previous?.subId && simIndex != -1) + || message.subId != previous?.subId && subscription != null) + holder.sim.setVisible(message.subId != previous?.subId && subscription != null) + holder.simIndex.setVisible(message.subId != previous?.subId && subscription != null) // Bind the grouping val media = message.parts.filter { !it.isSmil() && !it.isText() }