fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow selecting phoneNumberless private contacts too

Browse Source
This commit is contained in:
tibbi
2021-04-03 22:14:36 +02:00
parent 64c67c16ca
commit 52f7846867
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -56,7 +56,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:11624254b2' implementation 'com.github.SimpleMobileTools:Simple-Commons:5cec51606a'
implementation 'joda-time:joda-time:2.10.3' implementation 'joda-time:joda-time:2.10.3'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a' implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'

5
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
View File

@ -34,10 +34,7 @@ import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getTempFile import com.simplemobiletools.contacts.pro.extensions.getTempFile
import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick
import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.contacts.pro.helpers.ALL_TABS_MASK import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
import com.simplemobiletools.contacts.pro.helpers.VcfExporter
import com.simplemobiletools.contacts.pro.helpers.tabsList
import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*

5
app/src/main/kotlin/com/simplemobiletools/contacts/pro/contentproviders/MyContactsContentProvider.kt
View File

@ -27,7 +27,10 @@ class MyContactsContentProvider : ContentProvider() {
MyContactsContentProvider.COL_ANNIVERSARIES) MyContactsContentProvider.COL_ANNIVERSARIES)
) )
LocalContactsHelper(context!!).getPrivateSimpleContactsSync(selection == MyContactsContentProvider.FAVORITES_ONLY).forEach { val favoritesOnly = selectionArgs?.getOrNull(0)?.equals("1") ?: false
val withPhoneNumbersOnly = selectionArgs?.getOrNull(1)?.equals("1") ?: true
LocalContactsHelper(context!!).getPrivateSimpleContactsSync(favoritesOnly, withPhoneNumbersOnly).forEach {
val phoneNumbers = Gson().toJson(it.phoneNumbers) val phoneNumbers = Gson().toJson(it.phoneNumbers)
val birthdays = Gson().toJson(it.birthdays) val birthdays = Gson().toJson(it.birthdays)
val anniversaries = Gson().toJson(it.anniversaries) val anniversaries = Gson().toJson(it.anniversaries)

8
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
View File

@ -159,8 +159,8 @@ class LocalContactsHelper(val context: Context) {
} }
} }
private fun convertContactToSimpleContact(contact: Contact?): SimpleContact? { private fun convertContactToSimpleContact(contact: Contact?, withPhoneNumbersOnly: Boolean): SimpleContact? {
return if (contact == null || contact.phoneNumbers.isEmpty()) { return if (contact == null || (withPhoneNumbersOnly && contact.phoneNumbers.isEmpty())) {
null null
} else { } else {
val phoneNumbers = contact.phoneNumbers.map { it.value }.toMutableList() as ArrayList<String> val phoneNumbers = contact.phoneNumbers.map { it.value }.toMutableList() as ArrayList<String>
@ -170,5 +170,7 @@ class LocalContactsHelper(val context: Context) {
} }
} }
fun getPrivateSimpleContactsSync(favoritesOnly: Boolean) = getAllContacts(favoritesOnly).mapNotNull { convertContactToSimpleContact(it) } fun getPrivateSimpleContactsSync(favoritesOnly: Boolean, withPhoneNumbersOnly: Boolean) = getAllContacts(favoritesOnly).mapNotNull {
convertContactToSimpleContact(it, withPhoneNumbersOnly)
}
} }