From d2d5f306e29dd1447a680f816e4fc5f2d7376eae Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 23 Jan 2018 21:16:58 +0100 Subject: [PATCH] adding some null checks --- .../simplemobiletools/contacts/activities/MainActivity.kt | 8 ++++---- .../contacts/fragments/MyViewPagerFragment.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 06f1623c..730f4324 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -111,10 +111,10 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { if (viewpager.adapter == null) { initFragments() } - contacts_fragment.initContacts() - contacts_fragment.onActivityResume() - favorites_fragment.initContacts() - favorites_fragment.onActivityResume() + contacts_fragment?.initContacts() + contacts_fragment?.onActivityResume() + favorites_fragment?.initContacts() + favorites_fragment?.onActivityResume() } isFirstResume = false } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt index f66300bc..150cfd3e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -179,7 +179,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) } fun onSearchOpened() { - contactsIgnoringSearch = (fragment_list.adapter as ContactsAdapter).contactItems as ArrayList + contactsIgnoringSearch = (fragment_list.adapter as? ContactsAdapter)?.contactItems as ArrayList } fun onSearchClosed() {