From 3105093272a77f45091b332fca6e01707354cc4a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 3 Mar 2018 12:59:16 +0100
Subject: [PATCH] adding a couple crashfixes

---
 .../contacts/activities/ContactActivity.kt             | 10 +++++++---
 .../contacts/activities/MainActivity.kt                |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
index 1a63a6bf..0ef88394 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
@@ -95,13 +95,17 @@ abstract class ContactActivity : SimpleActivity() {
 
     fun deleteContact() {
         ConfirmationDialog(this) {
-            ContactsHelper(this).deleteContact(contact!!)
-            finish()
+            if (contact != null) {
+                ContactsHelper(this).deleteContact(contact!!)
+                finish()
+            }
         }
     }
 
     fun shareContact() {
-        shareContacts(arrayListOf(contact!!))
+        if (contact != null) {
+            shareContacts(arrayListOf(contact!!))
+        }
     }
 
     fun trySendSMS() {
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 9b64b946..023ee693 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -190,7 +190,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
 
                 override fun onQueryTextChange(newText: String): Boolean {
                     if (isSearchOpen) {
-                        getCurrentFragment().onSearchQueryChanged(newText)
+                        getCurrentFragment()?.onSearchQueryChanged(newText)
                     }
                     return true
                 }