From 369772388dbf3d3754b2c9153333fd35fcda8bcd Mon Sep 17 00:00:00 2001 From: Anindra Date: Thu, 19 Nov 2026 17:19:36 +0530 Subject: [PATCH] feat: a contact card can be saved and added to contacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A card could be seen and nothing else: tapping it did nothing, the selection toolbar offered no Save for it, and a card sent *to* this app arrived as "[MMS: 1 additional/unsupported attachment(s) not displayed]" because the importer only knew pictures, clips, voice notes and text. - Tapping a card opens a small dialog: "Add to contacts" (the contacts app's new-contact editor, prefilled with the name and number) and "Save contact" (a .vcf in Downloads/Messages). - A received text/x-vcard part is imported as a `contact` row, so the same card bubble shows up instead of the unsupported-attachment notice. - Save is offered for a contact in the selection toolbar, and the card keeps its .vcf name when written. - The save counter is incremented: it never was, so every save reported "could not save" even when the file had been written. The outcome is logged as "saved=N/total" because a toast cannot be read back. JUnit: ContactActionsTest (the values the insert carries, and that a card without a number cannot become a contact), MmsSupportTest (a received vCard becomes a contact row, not a notice; vCard files are kind contact) and SelectionToolbarTest (a card is saveable, with its own label). scripts/test-contact-card.sh: 9 checks on emulator-5556, 0 failed. On the previous build the four that cover keeping a card fail — no dialog, no save, no contacts app. --- .../messages/ui/previews/ContactPreviews.kt | 13 +++ .../java/com/anindra/messages/MainActivity.kt | 9 +++ .../com/anindra/messages/data/MmsSupport.kt | 27 +++++-- .../com/anindra/messages/data/Repository.kt | 2 + .../messages/sms/MmsDownloadReceiver.kt | 1 + .../messages/sms/NotificationHistory.kt | 4 +- .../com/anindra/messages/sms/SmsSupport.kt | 14 +++- .../com/anindra/messages/ui/ChatScreen.kt | 36 ++++++++- .../com/anindra/messages/ui/ContactActions.kt | 32 ++++++++ .../com/anindra/messages/ui/ContactBubble.kt | 11 ++- .../anindra/messages/ui/ContactCardDialog.kt | 79 +++++++++++++++++++ .../anindra/messages/ui/SelectionToolbar.kt | 2 + app/src/main/res/values-ar/strings_chat.xml | 4 + app/src/main/res/values-ar/strings_main.xml | 1 + app/src/main/res/values-de/strings_chat.xml | 4 + app/src/main/res/values-de/strings_main.xml | 1 + app/src/main/res/values-es/strings_chat.xml | 4 + app/src/main/res/values-es/strings_main.xml | 1 + app/src/main/res/values-fa/strings_chat.xml | 4 + app/src/main/res/values-fa/strings_main.xml | 1 + app/src/main/res/values-fr/strings_chat.xml | 4 + app/src/main/res/values-fr/strings_main.xml | 1 + app/src/main/res/values-hi/strings_chat.xml | 4 + app/src/main/res/values-hi/strings_main.xml | 1 + app/src/main/res/values-ja/strings_chat.xml | 4 + app/src/main/res/values-ja/strings_main.xml | 1 + app/src/main/res/values-ko/strings_chat.xml | 4 + app/src/main/res/values-ko/strings_main.xml | 1 + app/src/main/res/values-pl/strings_chat.xml | 4 + app/src/main/res/values-pl/strings_main.xml | 1 + .../main/res/values-pt-rBR/strings_chat.xml | 4 + .../main/res/values-pt-rBR/strings_main.xml | 1 + app/src/main/res/values-ru/strings_chat.xml | 4 + app/src/main/res/values-ru/strings_main.xml | 1 + .../main/res/values-zh-rCN/strings_chat.xml | 4 + .../main/res/values-zh-rCN/strings_main.xml | 1 + .../main/res/values-zh-rTW/strings_chat.xml | 4 + .../main/res/values-zh-rTW/strings_main.xml | 1 + app/src/main/res/values/strings_chat.xml | 4 + app/src/main/res/values/strings_main.xml | 1 + .../anindra/messages/data/MmsSupportTest.kt | 30 +++++++ .../anindra/messages/ui/ContactActionsTest.kt | 34 ++++++++ .../messages/ui/ContactCardWiringTest.kt | 19 +++++ .../messages/ui/SelectionToolbarTest.kt | 14 ++++ scripts | 2 +- 45 files changed, 382 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/com/anindra/messages/ui/ContactActions.kt create mode 100644 app/src/main/java/com/anindra/messages/ui/ContactCardDialog.kt create mode 100644 app/src/test/java/com/anindra/messages/ui/ContactActionsTest.kt diff --git a/app/src/debug/java/com/anindra/messages/ui/previews/ContactPreviews.kt b/app/src/debug/java/com/anindra/messages/ui/previews/ContactPreviews.kt index 8de3adfb..b3e92df5 100644 --- a/app/src/debug/java/com/anindra/messages/ui/previews/ContactPreviews.kt +++ b/app/src/debug/java/com/anindra/messages/ui/previews/ContactPreviews.kt @@ -40,3 +40,16 @@ private fun ContactBubblePreview() { } } } + +@PreviewLightDark +@Composable +private fun ContactCardDialogPreview() { + MessagesTheme(mode = "system") { + com.anindra.messages.ui.ContactCardDialog( + uri = "content://preview/contact", + onAddToContacts = { _, _ -> }, + onSaveFile = {}, + onDismiss = {} + ) + } +} diff --git a/app/src/main/java/com/anindra/messages/MainActivity.kt b/app/src/main/java/com/anindra/messages/MainActivity.kt index cd8b2f88..a896bfd5 100644 --- a/app/src/main/java/com/anindra/messages/MainActivity.kt +++ b/app/src/main/java/com/anindra/messages/MainActivity.kt @@ -802,10 +802,12 @@ class AppViewModel(app: Application) : AndroidViewModel(app) { var saved = 0 var allAudio = true var allVideo = true + var allContact = true for (msg in messages) { val target = MmsSupport.saveTargetFor(msg.mediaType) if (target != MmsSupport.SaveTarget.AUDIO) allAudio = false if (target != MmsSupport.SaveTarget.VIDEO) allVideo = false + if (target != MmsSupport.SaveTarget.FILE) allContact = false val uri = Uri.parse(msg.mediaUri) val bytes = runCatching { resolver.openInputStream(uri)?.use { it.readBytes() } @@ -821,6 +823,7 @@ class AppViewModel(app: Application) : AndroidViewModel(app) { ) val ok = bytes != null && bytes.isNotEmpty() && DownloadsStore.writeMedia(app, name, mime, bytes, target) + if (ok) saved++ // The toast is the only evidence a user gets, so the same outcome // names itself for the regression script. android.util.Log.d( @@ -828,9 +831,15 @@ class AppViewModel(app: Application) : AndroidViewModel(app) { "target=$target mime=$mime name=$name ok=$ok" ) } + // How many of the selection were written: the toast is chosen from + // this, and the regression script reads it back instead of a toast + // it cannot see. + android.util.Log.d("AttachmentSave", "saved=$saved/${messages.size} contact=$allContact") withContext(Dispatchers.Main) { val savedAll = saved == messages.size val message = when { + allContact && savedAll -> R.string.chat_contact_saved + allContact -> R.string.chat_contact_save_failed allAudio && savedAll -> R.string.chat_voice_saved allAudio -> R.string.chat_voice_save_failed allVideo && savedAll -> R.string.chat_video_saved diff --git a/app/src/main/java/com/anindra/messages/data/MmsSupport.kt b/app/src/main/java/com/anindra/messages/data/MmsSupport.kt index 579c45b6..5ca9ca2e 100644 --- a/app/src/main/java/com/anindra/messages/data/MmsSupport.kt +++ b/app/src/main/java/com/anindra/messages/data/MmsSupport.kt @@ -95,18 +95,22 @@ object MmsSupport { /** The clips of this MMS; a clip is never folded into a picture album. */ val videoIds: List = emptyList(), val audioId: Long? = null, - val audioMime: String = "" + val audioMime: String = "", + /** The contact cards this MMS carries. A card is a `text/x-vcard` part, + * which is what a phone sends when someone shares a contact. */ + val contactIds: List = emptyList() ) { val mediaType: String get() = when { imageId != null -> "image" videoIds.isNotEmpty() -> "video" audioId != null -> "audio" + contactIds.isNotEmpty() -> KIND_CONTACT else -> "text" } val mediaId: Long? - get() = imageId ?: videoIds.firstOrNull() ?: audioId + get() = imageId ?: videoIds.firstOrNull() ?: audioId ?: contactIds.firstOrNull() /** Every attachment this MMS carries, in the order it should be shown, as * (mediaType, partId). Empty for a text-only MMS. */ @@ -114,6 +118,7 @@ object MmsSupport { imageId?.let { add("image" to it) } extraImageIds.forEach { add("image" to it) } videoIds.forEach { add("video" to it) } + contactIds.forEach { add(KIND_CONTACT to it) } } } data class InboundMms( @@ -124,6 +129,9 @@ object MmsSupport { val imageUri: String? = null, /** The voice note of a voice MMS, or null. */ val audioUri: String? = null, + /** The contact card of a card MMS, or null. Like a picture, a card-only + * MMS has a blank body and needs a label to be shown at all. */ + val contactUri: String? = null, /** * The conversation the import filed this message under (#448). * @@ -134,6 +142,7 @@ object MmsSupport { val conversationId: Long = 0 ) { val isAudio: Boolean get() = audioUri != null + val isContact: Boolean get() = contactUri != null } /** [subscriptionId] is the line the announcement was filed under, or -1 when the * provider does not record one. The downloaded message keeps it. */ @@ -302,6 +311,9 @@ object MmsSupport { * received voice note can arrive as AMR, MP3 or OGG. */ fun isAudio(raw: String): Boolean = mime(raw).startsWith("audio/") + /** A contact card: the one part type a phone turns into a savable contact. */ + fun isVCard(raw: String): Boolean = mime(raw) == VCARD_MIME + /** The MIME the app labels a clip with when the provider does not say. */ const val DEFAULT_VIDEO_MIME = "video/mp4" @@ -310,12 +322,13 @@ object MmsSupport { ) /** The message `media_type` for an attachment of this type: pictures get the - * album layout, a clip its own bubble, a voice note its waveform, and - * everything else is a plain file. */ + * album layout, a clip its own bubble, a voice note its waveform, a contact + * card its card, and everything else is a plain file. */ fun mediaKind(rawMime: String): String = when { isImage(rawMime) -> "image" isVideo(rawMime) -> "video" isAudio(rawMime) -> "audio" + isVCard(rawMime) -> KIND_CONTACT else -> "file" } @@ -365,9 +378,10 @@ object MmsSupport { val audio = parts.firstOrNull { it.id > 0 && isAudio(it.mime) } ?.takeIf { images.isEmpty() } val videos = parts.filter { it.id > 0 && isVideo(it.mime) } + val contacts = parts.filter { it.id > 0 && isVCard(it.mime) } val text = parts.filter { mime(it.mime) == "text/plain" }.mapNotNull { it.text } .filter { it.isNotBlank() }.joinToString("\n") - val shownIds = (images + videos).map { it.id }.toSet() + val shownIds = (images + videos + contacts).map { it.id }.toSet() val omitted = parts.count { mime(it.mime) !in setOf("text/plain", "application/smil") && it.id !in shownIds && it !== audio @@ -380,7 +394,8 @@ object MmsSupport { extraImageIds = images.drop(1).map { it.id }, videoIds = videos.map { it.id }, audioId = audio?.id, - audioMime = audio?.let { mime(it.mime) } ?: "" + audioMime = audio?.let { mime(it.mime) } ?: "", + contactIds = contacts.map { it.id } ) } diff --git a/app/src/main/java/com/anindra/messages/data/Repository.kt b/app/src/main/java/com/anindra/messages/data/Repository.kt index 3e87ca22..f07967b4 100644 --- a/app/src/main/java/com/anindra/messages/data/Repository.kt +++ b/app/src/main/java/com/anindra/messages/data/Repository.kt @@ -5164,6 +5164,8 @@ class Repository(private val context: Context) { message.timestamp, imageUri = message.content.imageId?.let { "content://mms/part/$it" }, audioUri = message.content.audioId?.let { "content://mms/part/$it" }, + contactUri = message.content.contactIds.firstOrNull() + ?.let { "content://mms/part/$it" }, conversationId = cid ) ) diff --git a/app/src/main/java/com/anindra/messages/sms/MmsDownloadReceiver.kt b/app/src/main/java/com/anindra/messages/sms/MmsDownloadReceiver.kt index 4d4da6e9..b8195b6c 100644 --- a/app/src/main/java/com/anindra/messages/sms/MmsDownloadReceiver.kt +++ b/app/src/main/java/com/anindra/messages/sms/MmsDownloadReceiver.kt @@ -35,6 +35,7 @@ class MmsDownloadReceiver : BroadcastReceiver() { for (mms in repo.importDownloadedMms()) { NotificationHelper.show( context, mms.address, mms.body, mms.imageUri, audio = mms.isAudio, + contact = mms.isContact, conversationId = mms.conversationId ) } diff --git a/app/src/main/java/com/anindra/messages/sms/NotificationHistory.kt b/app/src/main/java/com/anindra/messages/sms/NotificationHistory.kt index 7050b867..291b38bf 100644 --- a/app/src/main/java/com/anindra/messages/sms/NotificationHistory.kt +++ b/app/src/main/java/com/anindra/messages/sms/NotificationHistory.kt @@ -12,7 +12,9 @@ data class NotificationLine( val imageUri: String? = null, /** True when the message carries a voice note. Like a picture, a voice MMS * has a blank body and is dropped unless it says what it is. */ - val isAudio: Boolean = false + val isAudio: Boolean = false, + /** True when the message carries a contact card, which is also blank-bodied. */ + val isContact: Boolean = false ) /** diff --git a/app/src/main/java/com/anindra/messages/sms/SmsSupport.kt b/app/src/main/java/com/anindra/messages/sms/SmsSupport.kt index 26d15705..a6f0de52 100644 --- a/app/src/main/java/com/anindra/messages/sms/SmsSupport.kt +++ b/app/src/main/java/com/anindra/messages/sms/SmsSupport.kt @@ -106,7 +106,8 @@ object NotificationHelper { imageUri: String? = null, privacyMode: Boolean = false, senderIcon: IconCompat? = null, - audio: Boolean = false + audio: Boolean = false, + contact: Boolean = false ): NotificationCompat.Style { val hideLinks = app.repository.settings.hideLinks val person = Person.Builder().setName(senderName) @@ -125,12 +126,14 @@ object NotificationHelper { // empty row, and the picture itself rides along as message data. val photoLabel = context.getString(R.string.notif_photo) val voiceLabel = context.getString(R.string.notif_voice) + val contactLabel = context.getString(R.string.notif_contact) val lines = NotificationHistory.window( if (history.isEmpty()) { listOf( NotificationLine( fallbackText, System.currentTimeMillis(), false, - isImage = imageUri != null, imageUri = imageUri, isAudio = audio + isImage = imageUri != null, imageUri = imageUri, isAudio = audio, + isContact = contact ) ) } else history.map { @@ -140,7 +143,8 @@ object NotificationHelper { fromMe = false, isImage = it.isImage, imageUri = it.imageUri, - isAudio = it.isAudio + isAudio = it.isAudio, + isContact = it.isContact ) } ) @@ -152,6 +156,7 @@ object NotificationHelper { it.text.isNotBlank() -> it.text it.isImage -> photoLabel it.isAudio -> voiceLabel + it.isContact -> contactLabel else -> it.text } val message = NotificationCompat.MessagingStyle.Message( @@ -401,6 +406,7 @@ object NotificationHelper { imageUri: String? = null, silentRepost: Boolean = false, audio: Boolean = false, + contact: Boolean = false, /** * The chat the import filed this message under (#448). A group has no * single address, so looking it up by [from] would post the group on the @@ -573,7 +579,7 @@ object NotificationHelper { .setStyle( groupedStyle( context, app, convoId, senderName, text, imageUri, privacyMode, - senderIcon = avatar?.icon, audio = audio + senderIcon = avatar?.icon, audio = audio, contact = contact ) ) avatar?.let { builder.setLargeIcon(it.bitmap) } 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 82582548..78a5b658 100644 --- a/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt +++ b/app/src/main/java/com/anindra/messages/ui/ChatScreen.kt @@ -354,6 +354,7 @@ internal fun ChatBubble( onTap: () -> Unit, onImageTap: (Message) -> Unit = {}, onVideoTap: (Message) -> Unit = {}, + onContactTap: (Message) -> Unit = {}, deliveryReports: Boolean, highlightLinks: Boolean, linkWarningEnabled: Boolean, @@ -544,7 +545,8 @@ internal fun ChatBubble( uri = msg.mediaUri, isMe = msg.isMe, isSelected = isSelected, - onLongPress = onLongPress + onLongPress = onLongPress, + onClick = { onContactTap(msg) } ) } else if (msg.mediaType == "audio" && msg.mediaUri.isNotBlank()) { VoiceBubble( @@ -1012,6 +1014,8 @@ fun ChatScreen( // chat, so opening it dismisses the IME and closing it gives the field back. var attachOpen by remember { mutableStateOf(false) } var showLocationDialog by remember { mutableStateOf(false) } + // The contact card the user tapped, if any: it offers "add to contacts". + var contactCard by remember { mutableStateOf(null) } val fieldFocus = remember { FocusRequester() } val keyboard = LocalSoftwareKeyboardController.current val focusManager = LocalFocusManager.current @@ -2214,6 +2218,10 @@ fun ChatScreen( if (selectionActive) toggleRowSelection(rowIds) else playingVideo = clip }, + onContactTap = { card -> + if (selectionActive) toggleRowSelection(rowIds) + else contactCard = card + }, deliveryReports = deliveryReports, highlightLinks = vm.settings.highlightLinks, linkWarningEnabled = vm.settings.linkOpenWarningEnabled, @@ -2339,6 +2347,32 @@ fun ChatScreen( ) } + contactCard?.let { card -> + ContactCardDialog( + uri = card.mediaUri, + onAddToContacts = { name, number -> + contactCard = null + val intent = ContactActions.addIntent(name, number) + if (intent != null) { + launchOrExplain(R.string.chat_contact_save_failed) { + context.startActivity(intent) + } + } else { + Toast.makeText( + context, + context.getString(R.string.chat_contact_unavailable), + Toast.LENGTH_SHORT + ).show() + } + }, + onSaveFile = { + contactCard = null + vm.saveMessageImage(card.id) + }, + onDismiss = { contactCard = null } + ) + } + // A device without a camera app, a photo picker, a document picker or a // contact picker throws instead of opening anything: an unhandled // ActivityNotFoundException crashed the chat the moment that tile was diff --git a/app/src/main/java/com/anindra/messages/ui/ContactActions.kt b/app/src/main/java/com/anindra/messages/ui/ContactActions.kt new file mode 100644 index 00000000..a723d3b0 --- /dev/null +++ b/app/src/main/java/com/anindra/messages/ui/ContactActions.kt @@ -0,0 +1,32 @@ +package com.anindra.messages.ui + +import android.content.Intent +import android.provider.ContactsContract + +/** + * What a contact card in the conversation can do. + * + * A card is only worth sending if the person who receives it can keep it, so a + * tap offers the two things a phone does with a vCard: add it to the contacts + * app, or write the file somewhere it can be opened later. + */ +object ContactActions { + + /** The name and number the insert intent carries, or null when the card has + * no number — there is nothing a contact could be created from. */ + fun insertValues(name: String?, number: String?): Pair? { + val phone = number?.trim().orEmpty() + if (phone.isEmpty()) return null + return name?.trim().orEmpty() to phone + } + + /** The contacts app's "new contact" intent, prefilled from the card. */ + fun addIntent(name: String?, number: String?): Intent? { + val (safeName, phone) = insertValues(name, number) ?: return null + return Intent(Intent.ACTION_INSERT, ContactsContract.Contacts.CONTENT_URI).apply { + type = ContactsContract.Contacts.CONTENT_TYPE + putExtra(ContactsContract.Intents.Insert.NAME, safeName) + putExtra(ContactsContract.Intents.Insert.PHONE, phone) + } + } +} diff --git a/app/src/main/java/com/anindra/messages/ui/ContactBubble.kt b/app/src/main/java/com/anindra/messages/ui/ContactBubble.kt index 8c818cb3..19a1ff5a 100644 --- a/app/src/main/java/com/anindra/messages/ui/ContactBubble.kt +++ b/app/src/main/java/com/anindra/messages/ui/ContactBubble.kt @@ -45,7 +45,8 @@ internal fun ContactBubble( uri: String, isMe: Boolean, isSelected: Boolean = false, - onLongPress: () -> Unit = {} + onLongPress: () -> Unit = {}, + onClick: () -> Unit = {} ) { val context = LocalContext.current val card = remember(uri) { ContactShare.readCard(context, Uri.parse(uri)) } @@ -54,7 +55,8 @@ internal fun ContactBubble( number = card?.second, isMe = isMe, isSelected = isSelected, - onLongPress = onLongPress + onLongPress = onLongPress, + onClick = onClick ) } @@ -66,7 +68,8 @@ internal fun ContactCardBubble( number: String?, isMe: Boolean, isSelected: Boolean = false, - onLongPress: () -> Unit = {} + onLongPress: () -> Unit = {}, + onClick: () -> Unit = {} ) { val cs = MaterialTheme.colorScheme val label = stringResource(R.string.chat_media_contact) @@ -76,7 +79,7 @@ internal fun ContactCardBubble( shape = RoundedCornerShape(16.dp), modifier = Modifier .widthIn(max = 260.dp) - .combinedClickable(onClick = {}, onLongClick = onLongPress) + .combinedClickable(onClick = onClick, onLongClick = onLongPress) ) { Row( Modifier.padding(horizontal = 12.dp, vertical = 10.dp), diff --git a/app/src/main/java/com/anindra/messages/ui/ContactCardDialog.kt b/app/src/main/java/com/anindra/messages/ui/ContactCardDialog.kt new file mode 100644 index 00000000..ec7f417a --- /dev/null +++ b/app/src/main/java/com/anindra/messages/ui/ContactCardDialog.kt @@ -0,0 +1,79 @@ +package com.anindra.messages.ui + +import android.net.Uri +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import com.anindra.messages.R + +/** + * What a tapped contact card can do: keep it in the contacts app, or save the + * file so it can be opened later. + * + * A card sent over MMS is only useful if the phone can save it — the receiving + * app decides how it arrives, but what happens next is this dialog. + */ +@Composable +internal fun ContactCardDialog( + uri: String, + onAddToContacts: (name: String?, number: String?) -> Unit, + onSaveFile: () -> Unit, + onDismiss: () -> Unit +) { + val context = LocalContext.current + val card = remember(uri) { ContactShare.readCard(context, Uri.parse(uri)) } + val name = card?.first + val number = card?.second + + Dialog(onDismissRequest = onDismiss) { + Surface( + shape = RoundedCornerShape(28.dp), + color = MaterialTheme.colorScheme.surfaceContainerHigh, + tonalElevation = 6.dp + ) { + Column(Modifier.fillMaxWidth().padding(24.dp)) { + Text( + text = name ?: stringResource(R.string.chat_media_contact), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + if (number != null) { + Text( + text = number, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Spacer(Modifier.height(12.dp)) + TextButton( + onClick = { onAddToContacts(name, number) }, + modifier = Modifier.align(Alignment.End) + ) { Text(stringResource(R.string.chat_add_to_contacts)) } + TextButton( + onClick = onSaveFile, + modifier = Modifier.align(Alignment.End) + ) { Text(stringResource(R.string.chat_save_contact)) } + TextButton( + onClick = onDismiss, + modifier = Modifier.align(Alignment.End) + ) { Text(stringResource(R.string.common_cancel)) } + } + } + } +} diff --git a/app/src/main/java/com/anindra/messages/ui/SelectionToolbar.kt b/app/src/main/java/com/anindra/messages/ui/SelectionToolbar.kt index 86454bc6..17ace55a 100644 --- a/app/src/main/java/com/anindra/messages/ui/SelectionToolbar.kt +++ b/app/src/main/java/com/anindra/messages/ui/SelectionToolbar.kt @@ -65,6 +65,7 @@ object SelectionToolbar { "image" -> MmsSupport.SaveTarget.IMAGE "video" -> MmsSupport.SaveTarget.VIDEO "audio" -> MmsSupport.SaveTarget.AUDIO + MmsSupport.KIND_CONTACT -> MmsSupport.SaveTarget.FILE else -> null } @@ -75,6 +76,7 @@ object SelectionToolbar { fun saveLabelRes(target: MmsSupport.SaveTarget, count: Int = 1): Int = when { target == MmsSupport.SaveTarget.AUDIO -> R.string.chat_save_voice target == MmsSupport.SaveTarget.VIDEO -> R.string.chat_save_video + target == MmsSupport.SaveTarget.FILE -> R.string.chat_save_contact count > 1 -> R.string.chat_save_images else -> R.string.chat_save_image } diff --git a/app/src/main/res/values-ar/strings_chat.xml b/app/src/main/res/values-ar/strings_chat.xml index a8646a45..8b8542a5 100644 --- a/app/src/main/res/values-ar/strings_chat.xml +++ b/app/src/main/res/values-ar/strings_chat.xml @@ -49,6 +49,10 @@ تم حفظ الرسالة الصوتية في Music/Messages تعذر حفظ الرسالة الصوتية + حفظ جهة الاتصال + إضافة إلى جهات الاتصال + تم حفظ جهة الاتصال في Downloads/Messages + تعذّر حفظ جهة الاتصال اسحب للإلغاء اترك للإلغاء diff --git a/app/src/main/res/values-ar/strings_main.xml b/app/src/main/res/values-ar/strings_main.xml index 960d388f..040e714b 100644 --- a/app/src/main/res/values-ar/strings_main.xml +++ b/app/src/main/res/values-ar/strings_main.xml @@ -59,6 +59,7 @@ أنت صورة رسالة صوتية + بطاقة جهة اتصال فشل إرسال الرسالة. انقر للمحاولة مرة أخرى. فشل إرسال الرسالة إلى %s. انقر للمحاولة مرة أخرى. لم تُسلّم الرسالة diff --git a/app/src/main/res/values-de/strings_chat.xml b/app/src/main/res/values-de/strings_chat.xml index 37bf496a..decd9924 100644 --- a/app/src/main/res/values-de/strings_chat.xml +++ b/app/src/main/res/values-de/strings_chat.xml @@ -48,6 +48,10 @@ Video konnte nicht gespeichert werden Sprachnachricht in Music/Messages gespeichert Sprachnachricht konnte nicht gespeichert werden + Kontakt speichern + Zu Kontakten hinzufügen + Kontakt unter Downloads/Messages gespeichert + Kontakt konnte nicht gespeichert werden Wischen zum Abbrechen Loslassen zum Abbrechen diff --git a/app/src/main/res/values-de/strings_main.xml b/app/src/main/res/values-de/strings_main.xml index e6697f75..27a98cb1 100644 --- a/app/src/main/res/values-de/strings_main.xml +++ b/app/src/main/res/values-de/strings_main.xml @@ -55,6 +55,7 @@ Sie Foto Sprachnachricht + Kontaktkarte Nachricht konnte nicht gesendet werden. Tippen zum wiederholen. Nachricht an %s konnte nicht gesendet werden. Tippen zum wiederholen. Nachricht nicht zugestellt diff --git a/app/src/main/res/values-es/strings_chat.xml b/app/src/main/res/values-es/strings_chat.xml index 2ca492d4..f318fc61 100644 --- a/app/src/main/res/values-es/strings_chat.xml +++ b/app/src/main/res/values-es/strings_chat.xml @@ -49,6 +49,10 @@ Mensaje de voz guardado en Music/Messages No se pudo guardar el mensaje de voz + Guardar contacto + Añadir a contactos + Contacto guardado en Downloads/Messages + No se pudo guardar el contacto Desliza para cancelar Suelta para cancelar diff --git a/app/src/main/res/values-es/strings_main.xml b/app/src/main/res/values-es/strings_main.xml index db3fddba..ad446b81 100644 --- a/app/src/main/res/values-es/strings_main.xml +++ b/app/src/main/res/values-es/strings_main.xml @@ -59,6 +59,7 @@ Tú Foto Mensaje de voz + Tarjeta de contacto No se pudo enviar el mensaje. Toca para reintentar. No se pudo enviar el mensaje a %s. Toca para reintentar. Mensaje no entregado diff --git a/app/src/main/res/values-fa/strings_chat.xml b/app/src/main/res/values-fa/strings_chat.xml index 38129926..1e668403 100644 --- a/app/src/main/res/values-fa/strings_chat.xml +++ b/app/src/main/res/values-fa/strings_chat.xml @@ -49,6 +49,10 @@ پیام صوتی در Music/Messages ذخیره شد ذخیره پیام صوتی ممکن نشد + ذخیره مخاطب + افزودن به مخاطبین + مخاطب در Downloads/Messages ذخیره شد + ذخیره مخاطب ممکن نشد برای لغو بکشید diff --git a/app/src/main/res/values-fa/strings_main.xml b/app/src/main/res/values-fa/strings_main.xml index 8d581962..c558943d 100644 --- a/app/src/main/res/values-fa/strings_main.xml +++ b/app/src/main/res/values-fa/strings_main.xml @@ -55,6 +55,7 @@ شما عکس پیام صوتی + کارت مخاطب پیام فرستاده نشد. برای تلاش مجدد ضربه بزنید. پیام به %s فرستاده نشد. برای تلاش مجدد ضربه بزنید. پیام تحویل نشد diff --git a/app/src/main/res/values-fr/strings_chat.xml b/app/src/main/res/values-fr/strings_chat.xml index 72d42c43..e43518c8 100644 --- a/app/src/main/res/values-fr/strings_chat.xml +++ b/app/src/main/res/values-fr/strings_chat.xml @@ -48,6 +48,10 @@ Impossible d\'enregistrer la vidéo Message vocal enregistré dans Musique/Messages Impossible d\'enregistrer le message vocal + Enregistrer le contact + Ajouter aux contacts + Contact enregistré dans Downloads/Messages + Impossible d\'enregistrer le contact Glisser pour annuler Relâcher pour annuler diff --git a/app/src/main/res/values-fr/strings_main.xml b/app/src/main/res/values-fr/strings_main.xml index f9766c74..3b6d22a1 100644 --- a/app/src/main/res/values-fr/strings_main.xml +++ b/app/src/main/res/values-fr/strings_main.xml @@ -55,6 +55,7 @@ Vous Photo Message vocal + Carte de contact Échec de l\'envoi du message. Appuyez pour réessayer. Échec de l\'envoi du message à %s. Appuyez pour réessayer. Message non remis diff --git a/app/src/main/res/values-hi/strings_chat.xml b/app/src/main/res/values-hi/strings_chat.xml index e363538e..dacc630e 100644 --- a/app/src/main/res/values-hi/strings_chat.xml +++ b/app/src/main/res/values-hi/strings_chat.xml @@ -49,6 +49,10 @@ वॉइस संदेश Music/Messages में सहेजा गया वॉइस संदेश सहेजा नहीं जा सका + संपर्क सहेजें + संपर्कों में जोड़ें + संपर्क Downloads/Messages में सहेजा गया + संपर्क सहेजा नहीं जा सका रद्द करने के लिए स्लाइड करें रद्द करने के लिए छोड़ें diff --git a/app/src/main/res/values-hi/strings_main.xml b/app/src/main/res/values-hi/strings_main.xml index 56e483b4..76e49625 100644 --- a/app/src/main/res/values-hi/strings_main.xml +++ b/app/src/main/res/values-hi/strings_main.xml @@ -59,6 +59,7 @@ आप फ़ोटो वॉइस संदेश + संपर्क कार्ड संदेश भेजा नहीं जा सका। पुनः प्रयास करने के लिए टैप करें। %s को संदेश भेजा नहीं जा सका। पुनः प्रयास करने के लिए टैप करें। संदेश वितरित नहीं हुआ diff --git a/app/src/main/res/values-ja/strings_chat.xml b/app/src/main/res/values-ja/strings_chat.xml index 655754a2..bb77553c 100644 --- a/app/src/main/res/values-ja/strings_chat.xml +++ b/app/src/main/res/values-ja/strings_chat.xml @@ -49,6 +49,10 @@ ボイスメッセージを Music/Messages に保存しました ボイスメッセージを保存できませんでした + 連絡先を保存 + 連絡先に追加 + 連絡先を Downloads/Messages に保存しました + 連絡先を保存できませんでした スライドしてキャンセル 離してキャンセル diff --git a/app/src/main/res/values-ja/strings_main.xml b/app/src/main/res/values-ja/strings_main.xml index efec0f2e..de6f9534 100644 --- a/app/src/main/res/values-ja/strings_main.xml +++ b/app/src/main/res/values-ja/strings_main.xml @@ -59,6 +59,7 @@ 自分 写真 ボイス メッセージ + 連絡先カード メッセージを送信できませんでした。タップして再試行。 %s にメッセージを送信できませんでした。タップして再試行。 メッセージが配信されませんでした diff --git a/app/src/main/res/values-ko/strings_chat.xml b/app/src/main/res/values-ko/strings_chat.xml index 00e1a461..64147e5d 100644 --- a/app/src/main/res/values-ko/strings_chat.xml +++ b/app/src/main/res/values-ko/strings_chat.xml @@ -49,6 +49,10 @@ 음성 메시지를 Music/Messages에 저장했습니다 음성 메시지를 저장할 수 없습니다 + 연락처 저장 + 연락처에 추가 + 연락처를 Downloads/Messages에 저장했습니다 + 연락처를 저장하지 못했습니다 밀어서 취소 놓아서 취소 diff --git a/app/src/main/res/values-ko/strings_main.xml b/app/src/main/res/values-ko/strings_main.xml index 4cee5290..01f270a2 100644 --- a/app/src/main/res/values-ko/strings_main.xml +++ b/app/src/main/res/values-ko/strings_main.xml @@ -59,6 +59,7 @@ 나 사진 음성 메시지 + 연락처 카드 메시지를 보낼 수 없습니다. 다시 시도하려면 탭하세요. %s(으)로 메시지를 보낼 수 없습니다. 다시 시도하려면 탭하세요. 메시지가 전달되지 않았습니다 diff --git a/app/src/main/res/values-pl/strings_chat.xml b/app/src/main/res/values-pl/strings_chat.xml index db89ba4d..7bc38456 100644 --- a/app/src/main/res/values-pl/strings_chat.xml +++ b/app/src/main/res/values-pl/strings_chat.xml @@ -49,6 +49,10 @@ Wiadomość głosowa zapisana w Music/Messages Nie można zapisać wiadomości głosowej + Zapisz kontakt + Dodaj do kontaktów + Kontakt zapisany w Downloads/Messages + Nie udało się zapisać kontaktu Przesuń, aby anulować Puść, aby anulować diff --git a/app/src/main/res/values-pl/strings_main.xml b/app/src/main/res/values-pl/strings_main.xml index 43999ff0..c7801f08 100644 --- a/app/src/main/res/values-pl/strings_main.xml +++ b/app/src/main/res/values-pl/strings_main.xml @@ -59,6 +59,7 @@ Ty Zdjęcie Wiadomość głosowa + Karta kontaktu Nie udało się wysłać wiadomości. Stuknij, aby ponowić. Nie udało się wysłać wiadomości do %s. Stuknij, aby ponowić. Wiadomość nie została dostarczona 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 d800ac7a..bd0872ad 100644 --- a/app/src/main/res/values-pt-rBR/strings_chat.xml +++ b/app/src/main/res/values-pt-rBR/strings_chat.xml @@ -49,6 +49,10 @@ Mensagem de voz salva em Music/Messages Não foi possível salvar a mensagem de voz + Salvar contato + Adicionar aos contatos + Contato salvo em Downloads/Messages + Não foi possível salvar o contato Deslize para cancelar Solte para cancelar diff --git a/app/src/main/res/values-pt-rBR/strings_main.xml b/app/src/main/res/values-pt-rBR/strings_main.xml index ce85c2b2..51eb6216 100644 --- a/app/src/main/res/values-pt-rBR/strings_main.xml +++ b/app/src/main/res/values-pt-rBR/strings_main.xml @@ -59,6 +59,7 @@ Você Foto Mensagem de voz + Cartão de contato Não foi possível enviar a mensagem. Toque para tentar novamente. Não foi possível enviar a mensagem para %s. Toque para tentar novamente. Mensagem não entregue diff --git a/app/src/main/res/values-ru/strings_chat.xml b/app/src/main/res/values-ru/strings_chat.xml index 77811a21..d406b5a0 100644 --- a/app/src/main/res/values-ru/strings_chat.xml +++ b/app/src/main/res/values-ru/strings_chat.xml @@ -49,6 +49,10 @@ Голосовое сообщение сохранено в Music/Messages Не удалось сохранить голосовое сообщение + Сохранить контакт + Добавить в контакты + Контакт сохранён в Downloads/Messages + Не удалось сохранить контакт Сдвиньте, чтобы отменить Отпустите, чтобы отменить diff --git a/app/src/main/res/values-ru/strings_main.xml b/app/src/main/res/values-ru/strings_main.xml index eecbfc99..614fbfbc 100644 --- a/app/src/main/res/values-ru/strings_main.xml +++ b/app/src/main/res/values-ru/strings_main.xml @@ -59,6 +59,7 @@ Вы Фото Голосовое сообщение + Контактная карточка Не удалось отправить сообщение. Нажмите для повтора. Не удалось отправить сообщение адресату %s. Нажмите для повтора. Сообщение не доставлено 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 2226d341..6d871b47 100644 --- a/app/src/main/res/values-zh-rCN/strings_chat.xml +++ b/app/src/main/res/values-zh-rCN/strings_chat.xml @@ -48,6 +48,10 @@ 语音消息已保存到 Music/Messages 无法保存语音消息 + 保存联系人 + 添加到联系人 + 联系人已保存到 Downloads/Messages + 无法保存联系人 滑动取消 松开取消 diff --git a/app/src/main/res/values-zh-rCN/strings_main.xml b/app/src/main/res/values-zh-rCN/strings_main.xml index aa2c4cdb..01c01393 100644 --- a/app/src/main/res/values-zh-rCN/strings_main.xml +++ b/app/src/main/res/values-zh-rCN/strings_main.xml @@ -56,6 +56,7 @@ 你 照片 语音消息 + 联系人名片 无法发送消息。轻触重试。 无法发送至 %s。轻触重试。 消息未送达 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 49d60082..24fc6fe6 100644 --- a/app/src/main/res/values-zh-rTW/strings_chat.xml +++ b/app/src/main/res/values-zh-rTW/strings_chat.xml @@ -48,6 +48,10 @@ 語音訊息已儲存至 Music/Messages 無法儲存語音訊息 + 儲存聯絡人 + 新增至聯絡人 + 聯絡人已儲存至 Downloads/Messages + 無法儲存聯絡人 滑動以取消 放開以取消 diff --git a/app/src/main/res/values-zh-rTW/strings_main.xml b/app/src/main/res/values-zh-rTW/strings_main.xml index 770ff1c8..53dc8944 100644 --- a/app/src/main/res/values-zh-rTW/strings_main.xml +++ b/app/src/main/res/values-zh-rTW/strings_main.xml @@ -56,6 +56,7 @@ 你 相片 語音訊息 + 聯絡人名片 無法傳送訊息。輕觸以重試。 無法傳送至 %s。輕觸以重試。 訊息未送達 diff --git a/app/src/main/res/values/strings_chat.xml b/app/src/main/res/values/strings_chat.xml index 24a2ba41..dc6f4c2a 100644 --- a/app/src/main/res/values/strings_chat.xml +++ b/app/src/main/res/values/strings_chat.xml @@ -48,6 +48,10 @@ Voice message saved to Music/Messages Could not save the voice message + Save contact + Add to contacts + Contact saved to Downloads/Messages + Could not save the contact Slide to cancel diff --git a/app/src/main/res/values/strings_main.xml b/app/src/main/res/values/strings_main.xml index b0d593a5..076f5ed2 100644 --- a/app/src/main/res/values/strings_main.xml +++ b/app/src/main/res/values/strings_main.xml @@ -59,6 +59,7 @@ You Photo Voice message + Contact card Couldn\'t send message. Tap to retry. Couldn\'t send message to %s. Tap to retry. Message not delivered diff --git a/app/src/test/java/com/anindra/messages/data/MmsSupportTest.kt b/app/src/test/java/com/anindra/messages/data/MmsSupportTest.kt index fae70788..4f386598 100644 --- a/app/src/test/java/com/anindra/messages/data/MmsSupportTest.kt +++ b/app/src/test/java/com/anindra/messages/data/MmsSupportTest.kt @@ -513,4 +513,34 @@ class MmsSupportTest { MmsSupport.savedAttachmentName("Alex", 1000L, "text/x-vcard", MmsSupport.SaveTarget.FILE) ) } + + @Test + fun aReceivedContactCardIsShownRatherThanReportedUnsupported() { + // A card is a text/x-vcard part. Before this it fell into "additional + // unsupported attachment(s) not displayed", so a contact sent to this + // app arrived as a notice instead of a card. + val content = MmsSupport.content(listOf(MmsSupport.Part(7, "text/x-vcard"))) + assertEquals(0, content.omittedParts) + assertEquals(listOf("contact" to 7L), content.mediaRows()) + assertEquals("contact", content.mediaType) + assertFalse(content.body.contains("not displayed")) + } + + @Test + fun aCardAlongsideAPictureKeepsBoth() { + val content = MmsSupport.content(listOf( + MmsSupport.Part(1, "image/png"), + MmsSupport.Part(2, "text/x-vcard") + )) + assertEquals(0, content.omittedParts) + assertEquals(listOf("image" to 1L, "contact" to 2L), content.mediaRows()) + } + + @Test + fun aVCardFileIsAKindContact() { + assertEquals("contact", MmsSupport.mediaKind("text/x-vcard")) + assertEquals("contact", MmsSupport.mediaKind("text/x-vCard; charset=utf-8")) + assertTrue(MmsSupport.isVCard("text/x-vcard")) + assertFalse(MmsSupport.isVCard("text/plain")) + } } diff --git a/app/src/test/java/com/anindra/messages/ui/ContactActionsTest.kt b/app/src/test/java/com/anindra/messages/ui/ContactActionsTest.kt new file mode 100644 index 00000000..fa330152 --- /dev/null +++ b/app/src/test/java/com/anindra/messages/ui/ContactActionsTest.kt @@ -0,0 +1,34 @@ +package com.anindra.messages.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +/** + * Tapping a contact card offers the two things a phone does with a vCard: put + * it in the contacts app, or save the file. + * + * The insert is only worth offering when there is a number to create the + * contact from; a card without one would open an empty editor. + */ +class ContactActionsTest { + + @Test + fun aCardWithANumberFillsTheNewContact() { + assertEquals( + "Alex Rivera" to "+15553334444", + ContactActions.insertValues("Alex Rivera", "+15553334444") + ) + } + + @Test + fun aNamelessCardStillCarriesItsNumber() { + assertEquals("" to "+15553334444", ContactActions.insertValues(null, " +15553334444 ")) + } + + @Test + fun aCardWithNoNumberCannotBecomeAContact() { + assertNull(ContactActions.insertValues("Alex", null)) + assertNull(ContactActions.insertValues("Alex", " ")) + } +} diff --git a/app/src/test/java/com/anindra/messages/ui/ContactCardWiringTest.kt b/app/src/test/java/com/anindra/messages/ui/ContactCardWiringTest.kt index 0d93fc6f..32f45fab 100644 --- a/app/src/test/java/com/anindra/messages/ui/ContactCardWiringTest.kt +++ b/app/src/test/java/com/anindra/messages/ui/ContactCardWiringTest.kt @@ -56,6 +56,25 @@ class ContactCardWiringTest { assertTrue(chat.contains("ContactBubble(")) } + @Test + fun tappingACardOffersToKeepIt() { + assertTrue( + "a card is only worth sending if the receiver can keep it", + chat.contains("ContactCardDialog(") + ) + val dialog = source("ui/ContactCardDialog.kt") + assertTrue("add to contacts", dialog.contains("R.string.chat_add_to_contacts")) + assertTrue("save the file", dialog.contains("R.string.chat_save_contact")) + assertTrue( + "and the save writes the card through the attachment saver", + chat.contains("vm.saveMessageImage(card.id)") + ) + assertTrue( + "the add action is built from the card, guarded for a missing app", + chat.contains("ContactActions.addIntent(name, number)") + ) + } + @Test fun theCardBubbleShowsTheNameAndNumber() { val bubble = source("ui/ContactBubble.kt") diff --git a/app/src/test/java/com/anindra/messages/ui/SelectionToolbarTest.kt b/app/src/test/java/com/anindra/messages/ui/SelectionToolbarTest.kt index 02867a38..b3e5d7c1 100644 --- a/app/src/test/java/com/anindra/messages/ui/SelectionToolbarTest.kt +++ b/app/src/test/java/com/anindra/messages/ui/SelectionToolbarTest.kt @@ -199,6 +199,20 @@ class SelectionToolbarTest { assertEquals(R.string.chat_save_image, SelectionToolbar.saveLabelRes(MmsSupport.SaveTarget.IMAGE)) } + @Test + fun aContactCardIsOfferedAsASaveableContact() { + // A card is a file, not a picture: it has to be saveable so the user can + // open it and add the contact, and the label must say so. + assertEquals( + MmsSupport.SaveTarget.FILE, + SelectionToolbar.saveTargetFor(MmsSupport.KIND_CONTACT) + ) + assertEquals( + R.string.chat_save_contact, + SelectionToolbar.saveLabelRes(MmsSupport.SaveTarget.FILE) + ) + } + @Test fun textAndFilesOfferNoSave() { assertNull(SelectionToolbar.saveTargetFor("text")) diff --git a/scripts b/scripts index c39aefe1..2dc5f9b5 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit c39aefe1553e5a67078457b7f71a3cbc1a154076 +Subproject commit 2dc5f9b54fb22d8aaef4816b5bfd36177950f402