From 8511cfd25a61d4c51910dbfedd63cf6358c1a53b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 4 Mar 2021 23:17:25 +0100
Subject: [PATCH] use the contacts name at sharing, if we share only one

---
 app/build.gradle                                          | 2 +-
 .../simplemobiletools/contacts/pro/extensions/Activity.kt | 8 +++++++-
 .../simplemobiletools/contacts/pro/extensions/Context.kt  | 4 ++--
 .../simplemobiletools/contacts/pro/helpers/Constants.kt   | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 55c412c1..dbffa39a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.34.6'
+    implementation 'com.simplemobiletools:commons:5.34.7'
     implementation 'joda-time:joda-time:2.10.3'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
index a351456c..b90a906f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
@@ -80,7 +80,13 @@ fun SimpleActivity.showContactSourcePicker(currentSource: String, callback: (new
 }
 
 fun BaseSimpleActivity.shareContacts(contacts: ArrayList<Contact>) {
-    val file = getTempFile()
+    val filename = if (contacts.size == 1) {
+        "${contacts.first().getNameToDisplay()}.vcf"
+    } else {
+        DEFAULT_FILE_NAME
+    }
+
+    val file = getTempFile(filename)
     if (file == null) {
         toast(R.string.unknown_error_occurred)
         return
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
index 91cef212..7ea4e3ee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
@@ -264,7 +264,7 @@ fun Context.sendEmailToContacts(contacts: ArrayList<Contact>) {
     }
 }
 
-fun Context.getTempFile(): File? {
+fun Context.getTempFile(filename: String = DEFAULT_FILE_NAME): File? {
     val folder = File(cacheDir, "contacts")
     if (!folder.exists()) {
         if (!folder.mkdir()) {
@@ -273,7 +273,7 @@ fun Context.getTempFile(): File? {
         }
     }
 
-    return File(folder, "contacts.vcf")
+    return File(folder, filename)
 }
 
 fun Context.addContactsToGroup(contacts: ArrayList<Contact>, groupId: Long) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
index a52405fa..cc6290bf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
@@ -29,6 +29,7 @@ const val IS_FROM_SIMPLE_CONTACTS = "is_from_simple_contacts"
 const val ADD_NEW_CONTACT_NUMBER = "add_new_contact_number"
 const val FIRST_CONTACT_ID = 1000000
 const val FIRST_GROUP_ID = 10000L
+const val DEFAULT_FILE_NAME = "contacts.vcf"
 
 // extras used at third party intents
 const val KEY_NAME = "name"