diff --git a/app/src/debug/java/com/anindra/messages/ui/previews/ListAndContainerPreviews.kt b/app/src/debug/java/com/anindra/messages/ui/previews/ListAndContainerPreviews.kt
index a773f380..f556d1cf 100644
--- a/app/src/debug/java/com/anindra/messages/ui/previews/ListAndContainerPreviews.kt
+++ b/app/src/debug/java/com/anindra/messages/ui/previews/ListAndContainerPreviews.kt
@@ -221,6 +221,6 @@ private fun MmsSupportPreview() {
// renders the no-SIMs state. That state is worth pinning: it is what a
// device with no SIMs shows, and it is easy to break the branch on.
Stage {
- MmsSupportScreen(onBack = {})
+ MmsSupportScreen(onBack = {}, mmsEnabled = true, onMmsEnabledChange = {})
}
}
diff --git a/app/src/debug/java/com/anindra/messages/ui/previews/MmsCardPreviews.kt b/app/src/debug/java/com/anindra/messages/ui/previews/MmsCardPreviews.kt
new file mode 100644
index 00000000..813c6b34
--- /dev/null
+++ b/app/src/debug/java/com/anindra/messages/ui/previews/MmsCardPreviews.kt
@@ -0,0 +1,34 @@
+package com.anindra.messages.ui.previews
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.PreviewLightDark
+import androidx.compose.ui.unit.dp
+import com.anindra.messages.ui.GroupedRowList
+import com.anindra.messages.ui.MmsCardRow
+import com.anindra.messages.ui.theme.MessagesTheme
+
+@PreviewLightDark
+@Composable
+private fun MmsCardRowPreview() {
+ MessagesTheme(mode = "system") {
+ Column(Modifier.padding(16.dp)) {
+ GroupedRowList {
+ MmsCardRow(
+ title = "MMS",
+ subtitle = "Pictures, voice notes and contacts are sent over MMS",
+ trailing = { Switch(checked = true, onCheckedChange = {}) },
+ showDivider = true
+ )
+ MmsCardRow(
+ title = "Android",
+ subtitle = "Off on this carrier · +1 · US · +15555215556",
+ showDivider = false
+ )
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/anindra/messages/MainActivity.kt b/app/src/main/java/com/anindra/messages/MainActivity.kt
index 14694ef9..8a676b25 100644
--- a/app/src/main/java/com/anindra/messages/MainActivity.kt
+++ b/app/src/main/java/com/anindra/messages/MainActivity.kt
@@ -669,7 +669,9 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
// recipients never see a group and their replies come back private
// (#448); this is the same rule AOSP, QKSMS and Fossify follow. Where the
// carrier forbids a group MMS, the per-person SMS below is the fallback.
- if (recipients.size > 1 && SmsSender.groupMmsEnabled(getApplication(), subId)) {
+ if (recipients.size > 1 && settings.mmsEnabled &&
+ SmsSender.groupMmsEnabled(getApplication(), subId)
+ ) {
val stored = repo.sendTextAsMms(conversationId, body, subId) ?: return
if (settings.soundsEnabled) NotificationHelper.playSentSound(getApplication())
val handedOff = SmsSender.sendMms(
@@ -735,6 +737,16 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
onStored(0)
return
}
+ // Every attachment — picture, clip, voice note, contact card — travels as
+ // an MMS part, so the setting stops the path rather than the picker: the
+ // share sheet and a retry reach this function directly.
+ if (!settings.mmsEnabled) {
+ Toast.makeText(
+ getApplication(), R.string.chat_mms_disabled, Toast.LENGTH_SHORT
+ ).show()
+ onStored(0)
+ return
+ }
scope.launch {
val convo = repo.conversationByIdSuspend(conversationId)
?: return@launch onStored(0)
@@ -857,6 +869,14 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
val msg = repo.messageByIdSuspend(messageId) ?: return@launch
val convo = repo.conversationByIdSuspend(msg.conversationId) ?: return@launch
if (!isPhoneNumber(convo.address)) return@launch
+ if (!settings.mmsEnabled && msg.mediaUri.isNotBlank()) {
+ withContext(Dispatchers.Main) {
+ Toast.makeText(
+ getApplication(), R.string.chat_mms_disabled, Toast.LENGTH_SHORT
+ ).show()
+ }
+ return@launch
+ }
repo.markMessageStatusSuspend(messageId, "sending")
val recipients = repo.conversationRecipients(msg.conversationId)
.filter { isPhoneNumber(it) }
@@ -1603,6 +1623,7 @@ open class MainActivity : FragmentActivity() {
}
applyAppLockProbe(intent, bootVm)
+ applyMmsProbe(intent, bootVm)
appLockEnabled = bootVm.settings.appLockEnabled
// Script hooks: --es set_theme dark|light|system|amoled|dynamic, --ez open_settings true, --ez privacy_mode true|false
@@ -2209,7 +2230,16 @@ onOpenAccessibility = { navRoute = "accessibility" },
}
)
"mms-check" -> MmsSupportScreen(
- onBack = { navRoute = "advanced" }
+ onBack = { navRoute = "advanced" },
+ mmsEnabled = vm.settings.mmsEnabled,
+ onMmsEnabledChange = { on ->
+ vm.settings.mmsEnabled = on
+ // The plus took the emoji button's
+ // place while MMS was on; turning
+ // MMS off hands that slot back, so
+ // the setting has to say so.
+ if (!on) vm.settings.emojiButtonEnabled = true
+ }
)
"notif-settings" -> NotificationSettingsScreen(
vm = vm,
@@ -2602,6 +2632,22 @@ onOpenAccessibility = { navRoute = "accessibility" },
* app-lock session, so a script can assert its lifetime without a real
* biometric prompt (an emulator has no enrolled fingerprint).
*/
+ /**
+ * Debug builds only: `--es mms_probe off|on` flips the MMS switch, so a
+ * regression script can drive the composer without walking the settings
+ * tree. It writes the same setting the switch writes.
+ */
+ private fun applyMmsProbe(intent: Intent, vm: AppViewModel) {
+ val debuggable =
+ (applicationInfo.flags and android.content.pm.ApplicationInfo.FLAG_DEBUGGABLE) != 0
+ if (!debuggable) return
+ // if/else rather than a `when`: the navigation test reads string-keyed
+ // branches as screens, and a probe is not one.
+ val probe = intent.getStringExtra("mms_probe")
+ if (probe == "off") vm.settings.mmsEnabled = false
+ if (probe == "on") vm.settings.mmsEnabled = true
+ }
+
private fun applyLockSessionProbe(intent: Intent) {
val debuggable =
(applicationInfo.flags and android.content.pm.ApplicationInfo.FLAG_DEBUGGABLE) != 0
diff --git a/app/src/main/java/com/anindra/messages/data/SettingsStore.kt b/app/src/main/java/com/anindra/messages/data/SettingsStore.kt
index 7761c0d7..2bdfb749 100644
--- a/app/src/main/java/com/anindra/messages/data/SettingsStore.kt
+++ b/app/src/main/java/com/anindra/messages/data/SettingsStore.kt
@@ -91,6 +91,7 @@ class SettingsStore(context: Context) {
const val KEY_SUGGESTED_REPLIES = "suggested_replies_enabled"
const val KEY_SHOW_SIM_INDICATOR = "show_sim_indicator"
const val KEY_EMOJI_BUTTON = "emoji_button_enabled"
+ const val KEY_MMS_ENABLED = "mms_enabled"
const val KEY_PERMANENT_DELETE = "permanent_delete_enabled"
const val KEY_PERMANENT_DELETE_WARN = "permanent_delete_warn"
const val KEY_REVERSE_SWIPE = "reverse_swipe_enabled"
@@ -453,6 +454,19 @@ class SettingsStore(context: Context) {
get() = prefs.getBoolean(KEY_EMOJI_BUTTON, DEFAULTS_EMOJI_BUTTON)
set(v) { prefs.edit().putBoolean(KEY_EMOJI_BUTTON, v).apply(); _revision.value++ }
+ /**
+ * Whether the app will send MMS at all.
+ *
+ * Turning it off leaves text messaging untouched: the composer loses its
+ * attach button, its tray and the microphone (a voice note is an MMS
+ * attachment), and the emoji button takes the slot the plus had. Incoming
+ * MMS is still received — a picture someone sends is not something the
+ * setting should throw away.
+ */
+ var mmsEnabled: Boolean
+ get() = prefs.getBoolean(KEY_MMS_ENABLED, true)
+ set(v) { prefs.edit().putBoolean(KEY_MMS_ENABLED, v).apply(); _revision.value++ }
+
var permanentDeleteEnabled: Boolean
get() = prefs.getBoolean(KEY_PERMANENT_DELETE, false)
set(v) { prefs.edit().putBoolean(KEY_PERMANENT_DELETE, v).apply(); _revision.value++ }
diff --git a/app/src/main/java/com/anindra/messages/ui/AdvancedSubScreens.kt b/app/src/main/java/com/anindra/messages/ui/AdvancedSubScreens.kt
index 7aab130b..643ea095 100644
--- a/app/src/main/java/com/anindra/messages/ui/AdvancedSubScreens.kt
+++ b/app/src/main/java/com/anindra/messages/ui/AdvancedSubScreens.kt
@@ -14,9 +14,12 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Switch
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -412,7 +415,11 @@ fun LinkSettingsScreen(vm: AppViewModel, onBack: () -> Unit) {
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun MmsSupportScreen(onBack: () -> Unit) {
+fun MmsSupportScreen(
+ onBack: () -> Unit,
+ mmsEnabled: Boolean,
+ onMmsEnabledChange: (Boolean) -> Unit
+) {
BackHandler(onBack = onBack)
val context = LocalContext.current
val checks = remember { SimMmsProbe.run(context) }
@@ -421,29 +428,36 @@ fun MmsSupportScreen(onBack: () -> Unit) {
title = stringResource(R.string.mms_check_title),
onBack = onBack
) {
- if (checks.isEmpty()) {
- SettingsGroup {
- SettingsRow(
- position = RowPosition.SINGLE,
- title = stringResource(R.string.mms_check_no_sims)
+ // One card, not a run of them: the switch and the per-SIM verdicts
+ // answer the same question, and two cards read as two unrelated things.
+ GroupedRowList(Modifier.padding(horizontal = SettingsLayout.SCREEN_PADDING)) {
+ MmsCardRow(
+ title = stringResource(R.string.settings_mms_enabled),
+ subtitle = stringResource(R.string.settings_mms_enabled_summary),
+ trailing = {
+ Switch(checked = mmsEnabled, onCheckedChange = onMmsEnabledChange)
+ },
+ onClick = { onMmsEnabledChange(!mmsEnabled) },
+ showDivider = true
+ )
+ if (checks.isEmpty()) {
+ MmsCardRow(
+ title = stringResource(R.string.mms_check_no_sims),
+ showDivider = false
)
- }
- } else {
- SettingsGroup {
+ } else {
checks.forEachIndexed { index, check ->
- SettingsRow(
- position = when {
- checks.size == 1 -> RowPosition.SINGLE
- index == 0 -> RowPosition.FIRST
- index == checks.lastIndex -> RowPosition.LAST
- else -> RowPosition.MIDDLE
- },
+ MmsCardRow(
title = check.carrierName?.takeIf { it.isNotBlank() }
?: stringResource(R.string.settings_sim_unknown),
- subtitle = mmsCheckSubtitle(check)
+ subtitle = mmsCheckSubtitle(check),
+ showDivider = index != checks.lastIndex
)
}
}
+ }
+
+ if (checks.isNotEmpty()) {
SettingsFooter(
stringResource(
R.string.mms_check_summary,
@@ -457,6 +471,51 @@ fun MmsSupportScreen(onBack: () -> Unit) {
}
}
+/**
+ * One line of the MMS card: a title, its explanation, and a control or a
+ * verdict. Split by hairlines inside a single [GroupedRowList] rather than each
+ * drawn as its own card, so the switch and the carriers read as one block.
+ */
+@Composable
+internal fun MmsCardRow(
+ title: String,
+ subtitle: String? = null,
+ trailing: @Composable (() -> Unit)? = null,
+ onClick: (() -> Unit)? = null,
+ showDivider: Boolean = true
+) {
+ Column(Modifier.fillMaxWidth()) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+ .padding(horizontal = SettingsLayout.ROW_CONTENT_PADDING, vertical = 14.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(Modifier.weight(1f)) {
+ Text(title, style = MaterialTheme.typography.bodyLarge)
+ if (subtitle != null) {
+ Text(
+ subtitle,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ }
+ if (trailing != null) {
+ Spacer(Modifier.width(12.dp))
+ trailing()
+ }
+ }
+ if (showDivider) {
+ HorizontalDivider(
+ color = MaterialTheme.colorScheme.outlineVariant,
+ modifier = Modifier.padding(start = SettingsLayout.ROW_CONTENT_PADDING)
+ )
+ }
+ }
+}
+
@Composable
private fun mmsCheckSubtitle(check: SimMmsCheck): String {
val verdict = stringResource(
diff --git a/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt b/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt
index 1f047700..36f6e2b6 100644
--- a/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt
+++ b/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt
@@ -1999,8 +1999,13 @@ fun ChatScreen(
// must not reserve an inset as well, or the tray lands on
// top of it.
composerBottomInset = composerInset,
- showEmojiButton = vm.settings.emojiButtonEnabled,
- voiceEnabled = hasMicrophone,
+ // With MMS off the plus has nothing to open: the emoji
+ // button takes its place, and the microphone goes with
+ // the tray because a voice note is an MMS attachment.
+ showEmojiButton = vm.settings.emojiButtonEnabled ||
+ !vm.settings.mmsEnabled,
+ attachEnabled = vm.settings.mmsEnabled,
+ voiceEnabled = hasMicrophone && vm.settings.mmsEnabled,
voiceMaxSeconds = voiceMaxSeconds,
onVoiceStart = { startVoiceNote() },
onVoiceFinish = {
@@ -3872,6 +3877,8 @@ internal fun InputBar(
schedulingEnabled: Boolean = true,
onEmojiToggle: () -> Unit,
onAttach: () -> Unit,
+ /** False when the app does not send MMS: no plus, and no tray behind it. */
+ attachEnabled: Boolean = true,
/** The tray is open under the bar, so the attach button offers to close it. */
attachOpen: Boolean = false,
/** Lets the caller hand focus back when the tray closes. */
@@ -4012,7 +4019,22 @@ internal fun InputBar(
verticalAlignment = Alignment.CenterVertically
) {
Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) {
- IconButton(onClick = onAttach) {
+ if (!attachEnabled) {
+ // The plus has nothing to open, so the slot it
+ // held carries the emoji button instead.
+ if (showEmojiButton) {
+ IconButton(
+ onClick = onEmojiToggle,
+ modifier = Modifier.size(40.dp)
+ ) {
+ Icon(
+ Icons.Rounded.EmojiEmotions,
+ stringResource(R.string.icon_emoji),
+ tint = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ }
+ } else IconButton(onClick = onAttach) {
// One ring, one animation: the plus turns 45° into the
// cross that closes the tray, so closing it is the same
// control it was opened with.
@@ -4120,7 +4142,7 @@ internal fun InputBar(
)
}
}
- if (showEmojiButton) {
+ if (showEmojiButton && attachEnabled) {
IconButton(onClick = onEmojiToggle, modifier = Modifier.size(40.dp)) {
Icon(
Icons.Rounded.EmojiEmotions, stringResource(R.string.icon_emoji),
diff --git a/app/src/main/res/values-ar/strings_advanced.xml b/app/src/main/res/values-ar/strings_advanced.xml
index 28e60f13..db4a8067 100644
--- a/app/src/main/res/values-ar/strings_advanced.xml
+++ b/app/src/main/res/values-ar/strings_advanced.xml
@@ -14,6 +14,8 @@
الخط
زر الرموز التعبيرية
إظهار زر الرموز التعبيرية في حقل الرسالة
+ MMS
+ تُرسل الصور والرسائل الصوتية وجهات الاتصال عبر MMS
اختيار الخط
DM Sans
Inter
diff --git a/app/src/main/res/values-ar/strings_chat.xml b/app/src/main/res/values-ar/strings_chat.xml
index 8b8542a5..2ceccd37 100644
--- a/app/src/main/res/values-ar/strings_chat.xml
+++ b/app/src/main/res/values-ar/strings_chat.xml
@@ -53,6 +53,7 @@
إضافة إلى جهات الاتصال
تم حفظ جهة الاتصال في Downloads/Messages
تعذّر حفظ جهة الاتصال
+ MMS متوقف — لا يمكن إرسال الصور أو الرسائل الصوتية
اسحب للإلغاء
اترك للإلغاء
diff --git a/app/src/main/res/values-de/strings_advanced.xml b/app/src/main/res/values-de/strings_advanced.xml
index 1efba614..b5029104 100644
--- a/app/src/main/res/values-de/strings_advanced.xml
+++ b/app/src/main/res/values-de/strings_advanced.xml
@@ -14,6 +14,8 @@
Schriftart
Emoji-Schaltfläche
Emoji-Schaltfläche im Nachrichtenfeld anzeigen
+ MMS
+ Bilder, Sprachnachrichten und Kontakte werden über MMS gesendet
Schriftart wählen
DM Sans
Inter
diff --git a/app/src/main/res/values-de/strings_chat.xml b/app/src/main/res/values-de/strings_chat.xml
index decd9924..71880afc 100644
--- a/app/src/main/res/values-de/strings_chat.xml
+++ b/app/src/main/res/values-de/strings_chat.xml
@@ -52,6 +52,7 @@
Zu Kontakten hinzufügen
Kontakt unter Downloads/Messages gespeichert
Kontakt konnte nicht gespeichert werden
+ MMS ist aus — Bilder und Sprachnachrichten können nicht gesendet werden
Wischen zum Abbrechen
Loslassen zum Abbrechen
diff --git a/app/src/main/res/values-es/strings_advanced.xml b/app/src/main/res/values-es/strings_advanced.xml
index f22b5339..bf697cca 100644
--- a/app/src/main/res/values-es/strings_advanced.xml
+++ b/app/src/main/res/values-es/strings_advanced.xml
@@ -14,6 +14,8 @@
Fuente
Botón de emoji
Mostrar el botón de emoji en el campo de mensaje
+ MMS
+ Las fotos, notas de voz y contactos se envían por MMS
Elegir fuente
DM Sans
Inter
diff --git a/app/src/main/res/values-es/strings_chat.xml b/app/src/main/res/values-es/strings_chat.xml
index f318fc61..151cd4ea 100644
--- a/app/src/main/res/values-es/strings_chat.xml
+++ b/app/src/main/res/values-es/strings_chat.xml
@@ -53,6 +53,7 @@
Añadir a contactos
Contacto guardado en Downloads/Messages
No se pudo guardar el contacto
+ MMS está desactivado: no se pueden enviar fotos ni notas de voz
Desliza para cancelar
Suelta para cancelar
diff --git a/app/src/main/res/values-fa/strings_advanced.xml b/app/src/main/res/values-fa/strings_advanced.xml
index 5b5d61ba..1e82170b 100644
--- a/app/src/main/res/values-fa/strings_advanced.xml
+++ b/app/src/main/res/values-fa/strings_advanced.xml
@@ -14,6 +14,8 @@
فونت
دکمه ایموجی
نمایش دکمه ایموجی در کادر پیام
+ MMS
+ عکسها، پیامهای صوتی و مخاطبین با MMS ارسال میشوند
انتخاب فونت
DM Sans
Inter
diff --git a/app/src/main/res/values-fa/strings_chat.xml b/app/src/main/res/values-fa/strings_chat.xml
index 1e668403..dcfc7232 100644
--- a/app/src/main/res/values-fa/strings_chat.xml
+++ b/app/src/main/res/values-fa/strings_chat.xml
@@ -53,6 +53,7 @@
افزودن به مخاطبین
مخاطب در Downloads/Messages ذخیره شد
ذخیره مخاطب ممکن نشد
+ MMS خاموش است — عکس و پیام صوتی ارسال نمیشود
برای لغو بکشید
diff --git a/app/src/main/res/values-fr/strings_advanced.xml b/app/src/main/res/values-fr/strings_advanced.xml
index f02e301a..8784f5a0 100644
--- a/app/src/main/res/values-fr/strings_advanced.xml
+++ b/app/src/main/res/values-fr/strings_advanced.xml
@@ -14,6 +14,8 @@
Police
Bouton emoji
Afficher le bouton emoji dans le champ de message
+ MMS
+ Les photos, messages vocaux et contacts sont envoyés par MMS
Choisir la police
DM Sans
Inter
diff --git a/app/src/main/res/values-fr/strings_chat.xml b/app/src/main/res/values-fr/strings_chat.xml
index e43518c8..dd54890c 100644
--- a/app/src/main/res/values-fr/strings_chat.xml
+++ b/app/src/main/res/values-fr/strings_chat.xml
@@ -52,6 +52,7 @@
Ajouter aux contacts
Contact enregistré dans Downloads/Messages
Impossible d\'enregistrer le contact
+ MMS désactivé — les photos et messages vocaux ne peuvent pas être envoyés
Glisser pour annuler
Relâcher pour annuler
diff --git a/app/src/main/res/values-hi/strings_advanced.xml b/app/src/main/res/values-hi/strings_advanced.xml
index b402e708..36feaf91 100644
--- a/app/src/main/res/values-hi/strings_advanced.xml
+++ b/app/src/main/res/values-hi/strings_advanced.xml
@@ -14,6 +14,8 @@
फ़ॉन्ट
इमोजी बटन
संदेश फ़ील्ड में इमोजी बटन दिखाएं
+ MMS
+ फ़ोटो, वॉइस नोट और संपर्क MMS से भेजे जाते हैं
फ़ॉन्ट चुनें
DM Sans
Inter
diff --git a/app/src/main/res/values-hi/strings_chat.xml b/app/src/main/res/values-hi/strings_chat.xml
index dacc630e..168e73d4 100644
--- a/app/src/main/res/values-hi/strings_chat.xml
+++ b/app/src/main/res/values-hi/strings_chat.xml
@@ -53,6 +53,7 @@
संपर्कों में जोड़ें
संपर्क Downloads/Messages में सहेजा गया
संपर्क सहेजा नहीं जा सका
+ MMS बंद है — फ़ोटो और वॉइस नोट नहीं भेजे जा सकते
रद्द करने के लिए स्लाइड करें
रद्द करने के लिए छोड़ें
diff --git a/app/src/main/res/values-ja/strings_advanced.xml b/app/src/main/res/values-ja/strings_advanced.xml
index 29cb6015..1f7263b1 100644
--- a/app/src/main/res/values-ja/strings_advanced.xml
+++ b/app/src/main/res/values-ja/strings_advanced.xml
@@ -14,6 +14,8 @@
フォント
絵文字ボタン
メッセージ入力欄に絵文字ボタンを表示
+ MMS
+ 写真、音声メッセージ、連絡先は MMS で送信されます
フォントを選択
DM Sans
Inter
diff --git a/app/src/main/res/values-ja/strings_chat.xml b/app/src/main/res/values-ja/strings_chat.xml
index bb77553c..3486ac98 100644
--- a/app/src/main/res/values-ja/strings_chat.xml
+++ b/app/src/main/res/values-ja/strings_chat.xml
@@ -53,6 +53,7 @@
連絡先に追加
連絡先を Downloads/Messages に保存しました
連絡先を保存できませんでした
+ MMS はオフです — 写真や音声メッセージは送信できません
スライドしてキャンセル
離してキャンセル
diff --git a/app/src/main/res/values-ko/strings_advanced.xml b/app/src/main/res/values-ko/strings_advanced.xml
index f8935668..c493b746 100644
--- a/app/src/main/res/values-ko/strings_advanced.xml
+++ b/app/src/main/res/values-ko/strings_advanced.xml
@@ -14,6 +14,8 @@
글꼴
이모지 버튼
메시지 입력란에 이모지 버튼 표시
+ MMS
+ 사진, 음성 메시지, 연락처는 MMS로 전송됩니다
글꼴 선택
DM Sans
Inter
diff --git a/app/src/main/res/values-ko/strings_chat.xml b/app/src/main/res/values-ko/strings_chat.xml
index 64147e5d..79d410af 100644
--- a/app/src/main/res/values-ko/strings_chat.xml
+++ b/app/src/main/res/values-ko/strings_chat.xml
@@ -53,6 +53,7 @@
연락처에 추가
연락처를 Downloads/Messages에 저장했습니다
연락처를 저장하지 못했습니다
+ MMS가 꺼져 있어 사진과 음성 메시지를 보낼 수 없습니다
밀어서 취소
놓아서 취소
diff --git a/app/src/main/res/values-pl/strings_advanced.xml b/app/src/main/res/values-pl/strings_advanced.xml
index ece48861..9da3231a 100644
--- a/app/src/main/res/values-pl/strings_advanced.xml
+++ b/app/src/main/res/values-pl/strings_advanced.xml
@@ -14,6 +14,8 @@
Czcionka
Przycisk emoji
Pokaż przycisk emoji w polu wiadomości
+ MMS
+ Zdjęcia, wiadomości głosowe i kontakty są wysyłane przez MMS
Wybierz czcionkę
DM Sans
Inter
diff --git a/app/src/main/res/values-pl/strings_chat.xml b/app/src/main/res/values-pl/strings_chat.xml
index 7bc38456..569c3067 100644
--- a/app/src/main/res/values-pl/strings_chat.xml
+++ b/app/src/main/res/values-pl/strings_chat.xml
@@ -53,6 +53,7 @@
Dodaj do kontaktów
Kontakt zapisany w Downloads/Messages
Nie udało się zapisać kontaktu
+ MMS jest wyłączone — nie można wysyłać zdjęć ani wiadomości głosowych
Przesuń, aby anulować
Puść, aby anulować
diff --git a/app/src/main/res/values-pt-rBR/strings_advanced.xml b/app/src/main/res/values-pt-rBR/strings_advanced.xml
index 37467d10..b15fad92 100644
--- a/app/src/main/res/values-pt-rBR/strings_advanced.xml
+++ b/app/src/main/res/values-pt-rBR/strings_advanced.xml
@@ -14,6 +14,8 @@
Fonte
Botão de emoji
Mostrar o botão de emoji no campo de mensagem
+ MMS
+ Fotos, mensagens de voz e contatos são enviados por MMS
Escolher fonte
DM Sans
Inter
diff --git a/app/src/main/res/values-pt-rBR/strings_chat.xml b/app/src/main/res/values-pt-rBR/strings_chat.xml
index bd0872ad..d96f581f 100644
--- a/app/src/main/res/values-pt-rBR/strings_chat.xml
+++ b/app/src/main/res/values-pt-rBR/strings_chat.xml
@@ -53,6 +53,7 @@
Adicionar aos contatos
Contato salvo em Downloads/Messages
Não foi possível salvar o contato
+ MMS está desativado — não é possível enviar fotos nem mensagens de voz
Deslize para cancelar
Solte para cancelar
diff --git a/app/src/main/res/values-ru/strings_advanced.xml b/app/src/main/res/values-ru/strings_advanced.xml
index 6eeac034..f34118d5 100644
--- a/app/src/main/res/values-ru/strings_advanced.xml
+++ b/app/src/main/res/values-ru/strings_advanced.xml
@@ -14,6 +14,8 @@
Шрифт
Кнопка эмодзи
Показывать кнопку эмодзи в поле сообщения
+ MMS
+ Фото, голосовые сообщения и контакты отправляются через MMS
Выберите шрифт
DM Sans
Inter
diff --git a/app/src/main/res/values-ru/strings_chat.xml b/app/src/main/res/values-ru/strings_chat.xml
index d406b5a0..331213c3 100644
--- a/app/src/main/res/values-ru/strings_chat.xml
+++ b/app/src/main/res/values-ru/strings_chat.xml
@@ -53,6 +53,7 @@
Добавить в контакты
Контакт сохранён в Downloads/Messages
Не удалось сохранить контакт
+ MMS отключено — фото и голосовые сообщения отправить нельзя
Сдвиньте, чтобы отменить
Отпустите, чтобы отменить
diff --git a/app/src/main/res/values-zh-rCN/strings_advanced.xml b/app/src/main/res/values-zh-rCN/strings_advanced.xml
index 948409b7..aeca1d5a 100644
--- a/app/src/main/res/values-zh-rCN/strings_advanced.xml
+++ b/app/src/main/res/values-zh-rCN/strings_advanced.xml
@@ -14,6 +14,8 @@
字体
表情符号按钮
在消息输入框中显示表情符号按钮
+ MMS
+ 照片、语音消息和联系人通过 MMS 发送
选择字体
DM Sans
Inter
diff --git a/app/src/main/res/values-zh-rCN/strings_chat.xml b/app/src/main/res/values-zh-rCN/strings_chat.xml
index 6d871b47..5ae187f2 100644
--- a/app/src/main/res/values-zh-rCN/strings_chat.xml
+++ b/app/src/main/res/values-zh-rCN/strings_chat.xml
@@ -52,6 +52,7 @@
添加到联系人
联系人已保存到 Downloads/Messages
无法保存联系人
+ MMS 已关闭 — 无法发送照片和语音消息
滑动取消
松开取消
diff --git a/app/src/main/res/values-zh-rTW/strings_advanced.xml b/app/src/main/res/values-zh-rTW/strings_advanced.xml
index ace6b824..d960c8cd 100644
--- a/app/src/main/res/values-zh-rTW/strings_advanced.xml
+++ b/app/src/main/res/values-zh-rTW/strings_advanced.xml
@@ -14,6 +14,8 @@
字型
表情符號按鈕
在訊息輸入欄顯示表情符號按鈕
+ MMS
+ 照片、語音訊息和聯絡人透過 MMS 傳送
選擇字型
DM Sans
Inter
diff --git a/app/src/main/res/values-zh-rTW/strings_chat.xml b/app/src/main/res/values-zh-rTW/strings_chat.xml
index 24fc6fe6..7f9ab2e2 100644
--- a/app/src/main/res/values-zh-rTW/strings_chat.xml
+++ b/app/src/main/res/values-zh-rTW/strings_chat.xml
@@ -52,6 +52,7 @@
新增至聯絡人
聯絡人已儲存至 Downloads/Messages
無法儲存聯絡人
+ MMS 已關閉 — 無法傳送照片和語音訊息
滑動以取消
放開以取消
diff --git a/app/src/main/res/values/strings_advanced.xml b/app/src/main/res/values/strings_advanced.xml
index fd8627d3..aa1cf014 100644
--- a/app/src/main/res/values/strings_advanced.xml
+++ b/app/src/main/res/values/strings_advanced.xml
@@ -15,6 +15,8 @@
Font
Emoji button
Show the emoji button in the message field
+ MMS
+ Pictures, voice notes and contacts are sent over MMS
Choose font
DM Sans
Inter
diff --git a/app/src/main/res/values/strings_chat.xml b/app/src/main/res/values/strings_chat.xml
index dc6f4c2a..ded543fc 100644
--- a/app/src/main/res/values/strings_chat.xml
+++ b/app/src/main/res/values/strings_chat.xml
@@ -52,6 +52,7 @@
Add to contacts
Contact saved to Downloads/Messages
Could not save the contact
+ MMS is off — pictures and voice notes cannot be sent
Slide to cancel
diff --git a/app/src/test/java/com/anindra/messages/i18n/PersianLocaleTest.kt b/app/src/test/java/com/anindra/messages/i18n/PersianLocaleTest.kt
index eaf4935b..552b2f5d 100644
--- a/app/src/test/java/com/anindra/messages/i18n/PersianLocaleTest.kt
+++ b/app/src/test/java/com/anindra/messages/i18n/PersianLocaleTest.kt
@@ -34,7 +34,7 @@ class PersianLocaleTest {
private val latinByDesign = setOf(
"font_dm_sans", "font_inter", "font_figtree", "font_poppins",
"time_format_date", "time_format_divider",
- "status_sms", "settings_theme_amoled", "settings_sound_dragon",
+ "status_sms", "settings_mms_enabled", "settings_theme_amoled", "settings_sound_dragon",
"about_licences_subtitle", "settings_import_source_sms_ie_title",
)
diff --git a/app/src/test/java/com/anindra/messages/ui/MmsDisabledComposerTest.kt b/app/src/test/java/com/anindra/messages/ui/MmsDisabledComposerTest.kt
new file mode 100644
index 00000000..599f666b
--- /dev/null
+++ b/app/src/test/java/com/anindra/messages/ui/MmsDisabledComposerTest.kt
@@ -0,0 +1,106 @@
+package com.anindra.messages.ui
+
+import java.io.File
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * With MMS switched off the app sends text only.
+ *
+ * A voice note, a picture and a contact card are all MMS parts, so the composer
+ * must not offer any of them — and the slot the plus held carries the emoji
+ * button instead, which is why turning MMS off also turns that setting on.
+ */
+class MmsDisabledComposerTest {
+
+ private fun source(relative: String): String {
+ val app = generateSequence(File("").absoluteFile) { it.parentFile }
+ .map { File(it, "app") }
+ .firstOrNull { File(it, "src").isDirectory }
+ ?: error("app/src not found")
+ return File(app, "src/main/java/com/anindra/messages/$relative").readText()
+ }
+
+ private val chat: String by lazy { source("ui/ChatScreen.kt") }
+ private val main: String by lazy { source("MainActivity.kt") }
+
+ @Test
+ fun theSettingExistsAndIsOnByDefault() {
+ val store = source("data/SettingsStore.kt")
+ assertTrue(store.contains("KEY_MMS_ENABLED"))
+ assertTrue(
+ "the app sends MMS until the user says otherwise",
+ store.contains("""prefs.getBoolean(KEY_MMS_ENABLED, true)""")
+ )
+ }
+
+ @Test
+ fun theComposerLosesAttachAndTheMicrophone() {
+ assertTrue(chat.contains("attachEnabled = vm.settings.mmsEnabled"))
+ assertTrue(
+ "a voice note is an MMS attachment, so the microphone goes with the tray",
+ chat.contains("voiceEnabled = hasMicrophone && vm.settings.mmsEnabled")
+ )
+ }
+
+ @Test
+ fun theEmojiButtonTakesThePlusSlot() {
+ assertTrue(
+ "the button is offered whenever attachments are not",
+ chat.contains("showEmojiButton = vm.settings.emojiButtonEnabled ||") &&
+ chat.contains("!vm.settings.mmsEnabled")
+ )
+ assertTrue(
+ "and it is drawn in the slot the plus had, not a second one",
+ chat.contains("if (!attachEnabled) {") && chat.contains("} else IconButton(onClick = onAttach) {")
+ )
+ assertTrue(
+ "the trailing emoji button must not double up",
+ chat.contains("if (showEmojiButton && attachEnabled) {")
+ )
+ }
+
+ @Test
+ fun everySendPathRefusesMedia() {
+ val send = main.substringAfter("fun sendMediaAlbum(").substringBefore("fun retryMessage(")
+ assertTrue(send.contains("if (!settings.mmsEnabled)"))
+ assertTrue(send.contains("R.string.chat_mms_disabled"))
+ val retry = main.substringAfter("fun retryMessage(").substringBefore("fun deliveryReportsEnabled(")
+ assertTrue("a retry would otherwise put the picture back on the wire",
+ retry.contains("!settings.mmsEnabled && msg.mediaUri.isNotBlank()"))
+ }
+
+ @Test
+ fun aGroupTextFallsBackToSmsInsteadOfMms() {
+ assertTrue(
+ main.contains("recipients.size > 1 && settings.mmsEnabled &&")
+ )
+ }
+
+ @Test
+ fun theSwitchIsOnTheMmsSupportPage() {
+ val screen = source("ui/AdvancedSubScreens.kt")
+ assertTrue(screen.contains("fun MmsSupportScreen("))
+ assertTrue(screen.contains("R.string.settings_mms_enabled"))
+ assertTrue(screen.contains("onCheckedChange = onMmsEnabledChange"))
+ }
+
+ @Test
+ fun theSwitchAndTheCarriersShareOneCard() {
+ // Two cards read as two unrelated things: the switch answers the same
+ // question the carrier verdicts do, so they sit in one grouped list
+ // split by hairlines.
+ val screen = source("ui/AdvancedSubScreens.kt")
+ val card = screen.substringAfter("GroupedRowList(")
+ .substringBefore("SettingsFooter(")
+ assertTrue("the switch is in the card", card.contains("R.string.settings_mms_enabled"))
+ assertTrue("and so are the carrier verdicts", card.contains("checks.forEachIndexed"))
+ val page = screen.substringAfter("fun MmsSupportScreen(")
+ .substringBefore("@Composable\nprivate fun mmsCheckSubtitle")
+ assertFalse(
+ "a SettingsGroup would draw each row as its own card again",
+ page.contains("SettingsGroup {")
+ )
+ }
+}
diff --git a/scripts b/scripts
index 1819f411..7f319eda 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1819f41150b27ae48363f2907d4d6c6613f2e61b
+Subproject commit 7f319edac168c94e3bc98c796f5bdf7e969a9814