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

move contact source filtering in a different function

Browse Source
This commit is contained in:
tibbi
2020-04-26 21:01:51 +02:00
parent f40285f672
commit 4b8ea90443
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
View File

@ -55,20 +55,13 @@ fun SimpleActivity.startCall(contact: Contact) {
} }
fun SimpleActivity.showContactSourcePicker(currentSource: String, callback: (newSource: String) -> Unit) { fun SimpleActivity.showContactSourcePicker(currentSource: String, callback: (newSource: String) -> Unit) {
ContactsHelper(this).getContactSources { ContactsHelper(this).getSaveableContactSources { sources ->
val ignoredTypes = arrayListOf(
SIGNAL_PACKAGE,
TELEGRAM_PACKAGE,
WHATSAPP_PACKAGE
)
val items = ArrayList<RadioItem>() val items = ArrayList<RadioItem>()
val filteredSources = it.filter { !ignoredTypes.contains(it.type) } var sourceNames = sources.map { it.name }
var sources = filteredSources.map { it.name } var currentSourceIndex = sourceNames.indexOfFirst { it == currentSource }
var currentSourceIndex = sources.indexOfFirst { it == currentSource } sourceNames = sources.map { it.publicName }
sources = filteredSources.map { it.publicName }
sources.forEachIndexed { index, account -> sourceNames.forEachIndexed { index, account ->
items.add(RadioItem(index, account)) items.add(RadioItem(index, account))
if (currentSource == SMT_PRIVATE && account == getString(R.string.phone_storage_hidden)) { if (currentSource == SMT_PRIVATE && account == getString(R.string.phone_storage_hidden)) {
currentSourceIndex = index currentSourceIndex = index
@ -77,7 +70,7 @@ fun SimpleActivity.showContactSourcePicker(currentSource: String, callback: (new
runOnUiThread { runOnUiThread {
RadioGroupDialog(this, items, currentSourceIndex) { RadioGroupDialog(this, items, currentSourceIndex) {
callback(filteredSources[it as Int].name) callback(sources[it as Int].name)
} }
} }
} }

14
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
View File

@ -740,6 +740,20 @@ class ContactsHelper(val context: Context) {
return ArrayList(sources) return ArrayList(sources)
} }
fun getSaveableContactSources(callback: (ArrayList<ContactSource>) -> Unit) {
ensureBackgroundThread {
val ignoredTypes = arrayListOf(
SIGNAL_PACKAGE,
TELEGRAM_PACKAGE,
WHATSAPP_PACKAGE
)
val contactSources = getContactSourcesSync()
val filteredSources = contactSources.filter { !ignoredTypes.contains(it.type) }.toMutableList() as ArrayList<ContactSource>
callback(filteredSources)
}
}
fun getDeviceContactSources(): LinkedHashSet<ContactSource> { fun getDeviceContactSources(): LinkedHashSet<ContactSource> {
val sources = LinkedHashSet<ContactSource>() val sources = LinkedHashSet<ContactSource>()
if (!context.hasContactPermissions()) { if (!context.hasContactPermissions()) {