diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 5813bec9..f6937d88 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
+
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
index bab258b1..6b21cf1b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
@@ -234,7 +234,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
sim.setVisible(state.subscription != null)
sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
- simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"
+ simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()
send.isEnabled = state.canSend
send.imageAlpha = if (state.canSend) 255 else 128
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
index bf771934..59edb545 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
@@ -20,8 +20,10 @@ package com.moez.QKSMS.feature.compose
import android.content.Context
import android.net.Uri
+import android.os.Vibrator
import android.provider.ContactsContract
import android.telephony.SmsMessage
+import androidx.core.content.getSystemService
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel
@@ -616,6 +618,13 @@ class ComposeViewModel @Inject constructor(
subIndex < subs.size - 1 -> subs[subIndex + 1]
else -> subs[0]
}
+
+ if (subscription != null) {
+ context.getSystemService()?.vibrate(40)
+ context.makeToast(context.getString(R.string.compose_sim_changed_toast,
+ subscription.simSlotIndex + 1, subscription.displayName))
+ }
+
newState { copy(subscription = subscription) }
}
.autoDisposable(view.scope())
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 c27fa4f7..933e8295 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
@@ -226,7 +226,7 @@ class MessagesAdapter @Inject constructor(
val subscription = subs.find { sub -> sub.subscriptionId == message.subId }
holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
- holder.simIndex.text = subscription?.let { sub -> sub.simSlotIndex + 1 }?.toString()
+ holder.simIndex.text = subscription?.simSlotIndex?.plus(1)?.toString()
holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD
|| message.subId != previous?.subId && subscription != null)
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index f59de547..81147bf9 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -137,6 +137,8 @@
Schedule message
Attach a contact
Error reading contact
+
+ SIM %1$d (%2$s) selected
%s selected, change SIM card
Send message