From 22b4dd0a192e3ccbc27bc099b7b009c2b4e3338a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 2 Jan 2018 23:30:29 +0100 Subject: [PATCH] do not show filter contact source dialog if theres no available sources --- .../contacts/dialogs/FilterContactSourcesDialog.kt | 4 ++++ .../com/simplemobiletools/contacts/helpers/ContactsHelper.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt index 82438698..c3f2d5c5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt @@ -15,6 +15,10 @@ class FilterContactSourcesDialog(val activity: SimpleActivity, val callback: () init { ContactsHelper(activity).getContactSources { + if (it.isEmpty()) { + return@getContactSources + } + val selectedSources = activity.config.displayContactSources activity.runOnUiThread { view.filter_contact_sources_list.adapter = FilterContactSourcesAdapter(activity, it, selectedSources) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index 3d6dd75e..1e335da9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -231,7 +231,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { cursor = activity.contentResolver.query(uri, projection, null, null, null) if (cursor?.moveToFirst() == true) { do { - val name = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) + val name = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) ?: continue accounts.add(name) } while (cursor.moveToNext()) }