fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow toggling SIM cards at sending messages

This commit is contained in:
tibbi 2020-05-03 22:57:31 +02:00
parent 49a7cd98f5
commit f5d3c2ab70
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -50,10 +50,12 @@ class ThreadActivity : SimpleActivity() {
private val PICK_ATTACHMENT_INTENT = 1
private var threadId = 0
private var currentSIMCardIndex = 0
private var threadItems = ArrayList<ThreadItem>()
private var bus: EventBus? = null
private var participants = ArrayList<Contact>()
private var messages = ArrayList<Message>()
private val availableSIMCards = ArrayList<SIMCard>()
private var attachmentUris = LinkedHashSet<Uri>()
override fun onCreate(savedInstanceState: Bundle?) {
@ -266,10 +268,27 @@ class ThreadActivity : SimpleActivity() {
val availableSIMs = SubscriptionManager.from(this).activeSubscriptionInfoList
if (availableSIMs.size > 1) {
availableSIMs.forEachIndexed { index, subscriptionInfo ->
var label = subscriptionInfo.displayName.toString()
if (subscriptionInfo.number.isNotEmpty()) {
label += " (${subscriptionInfo.number})"
}
val SIMCard = SIMCard(index + 1, subscriptionInfo.subscriptionId, label)
availableSIMCards.add(SIMCard)
}
currentSIMCardIndex = 0
thread_select_sim_icon.applyColorFilter(textColor)
thread_select_sim_icon.beVisible()
thread_select_sim_icon.setOnClickListener {
thread_select_sim_number.beVisible()
if (availableSIMCards.isNotEmpty()) {
thread_select_sim_icon.setOnClickListener {
currentSIMCardIndex = (currentSIMCardIndex + 1) % availableSIMCards.size
val currentSIMCard = availableSIMCards[currentSIMCardIndex]
thread_select_sim_number.text = currentSIMCard.id.toString()
toast(currentSIMCard.label)
}
}
thread_select_sim_number.setTextColor(textColor.getContrastColor())
@ -447,6 +466,11 @@ class ThreadActivity : SimpleActivity() {
val settings = Settings()
settings.useSystemSending = true
val SIMId = availableSIMCards.getOrNull(currentSIMCardIndex)?.subscriptionId
if (SIMId != null) {
settings.subscriptionId = SIMId
}
val transaction = Transaction(this, settings)
val message = com.klinker.android.send_message.Message(msg, numbers)

3
app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SIMCard.kt Normal file
View File

@ -0,0 +1,3 @@
package com.simplemobiletools.smsmessenger.models
data class SIMCard(val id: Int, val subscriptionId: Int, val label: String)

4
app/src/main/res/layout/activity_thread.xml
View File

@ -173,7 +173,8 @@
android:alpha="0.9"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/normal_margin"
android:src="@drawable/ic_sim_vector" />
android:src="@drawable/ic_sim_vector"
android:visibility="gone" />
<TextView
android:id="@+id/thread_select_sim_number"
@ -185,6 +186,7 @@
android:layout_alignBottom="@+id/thread_select_sim_icon"
android:gravity="center"
android:textSize="@dimen/normal_text_size"
android:visibility="gone"
tools:text="1" />
<ImageView