diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 163efec9..479d531e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -370,16 +370,24 @@ class ThreadActivity : SimpleActivity() { showSelectedContacts() } + @SuppressLint("MissingPermission") private fun getThreadItems(): ArrayList { messages.sortBy { it.date } + val subscriptionIdToSimId = HashMap() + subscriptionIdToSimId[-1] = "?" + SubscriptionManager.from(this).activeSubscriptionInfoList.forEachIndexed { index, subscriptionInfo -> + subscriptionIdToSimId[subscriptionInfo.subscriptionId] = "${index + 1}" + } + val items = ArrayList() var prevDateTime = 0 var hadUnreadItems = false messages.forEach { // do not show the date/time above every message, only if the difference between the 2 messages is at least MIN_DATE_TIME_DIFF_SECS if (it.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS) { - items.add(ThreadDateTime(it.date)) + val simCardID = subscriptionIdToSimId[it.subscriptionId] ?: "?" + items.add(ThreadDateTime(it.date, simCardID)) prevDateTime = it.date } items.add(it) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt index 0a609b19..7eb239b1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt @@ -3,6 +3,7 @@ package com.simplemobiletools.smsmessenger.adapters import android.content.Intent import android.graphics.drawable.Drawable import android.net.Uri +import android.telephony.SubscriptionManager import android.view.Menu import android.view.View import android.view.ViewGroup @@ -42,6 +43,7 @@ class ThreadAdapter(activity: SimpleActivity, var messages: ArrayList Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) { private val roundedCornersRadius = resources.getDimension(R.dimen.normal_margin).toInt() + private val hasMultipleSIMCards = SubscriptionManager.from(activity).activeSubscriptionInfoList.size > 1 init { setupDragListener(true) @@ -283,6 +285,14 @@ class ThreadAdapter(activity: SimpleActivity, var messages: ArrayList - + android:layout_marginTop="@dimen/medium_margin"> + + + + + + + +