fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-24 23:27:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid some null extras at third party intents

Browse Source
This commit is contained in:
tibbi 2018-09-27 14:00:55 +02:00
parent 26061d8827
commit 2f59a84748
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
View File

@ -153,14 +153,20 @@ class EditContactActivity : ContactActivity() {
setupEditContact() setupEditContact()
} }
if ((contact!!.id == 0 && intent.extras?.containsKey(KEY_PHONE) == true && action == Intent.ACTION_INSERT) || action == ADD_NEW_CONTACT_NUMBER) { if ((contact!!.id == 0 && intent.extras != null && intent.extras.containsKey(KEY_PHONE) && action == Intent.ACTION_INSERT) || action == ADD_NEW_CONTACT_NUMBER) {
val phoneNumber = intent.extras.get(KEY_PHONE)?.toString() ?: "" val phone = intent.extras.get(KEY_PHONE)
contact!!.phoneNumbers.add(PhoneNumber(phoneNumber, DEFAULT_PHONE_NUMBER_TYPE, "")) if (phone != null) {
if (phoneNumber.isNotEmpty() && action == ADD_NEW_CONTACT_NUMBER) { val phoneNumber = phone.toString()
highlightLastPhoneNumber = true contact!!.phoneNumbers.add(PhoneNumber(phoneNumber, DEFAULT_PHONE_NUMBER_TYPE, ""))
if (phoneNumber.isNotEmpty() && action == ADD_NEW_CONTACT_NUMBER) {
highlightLastPhoneNumber = true
}
} }
contact!!.firstName = intent.extras.get(KEY_NAME)?.toString() ?: "" val firstName = intent.extras.get(KEY_NAME)
if (firstName != null) {
contact!!.firstName = firstName.toString()
}
val data = intent.extras.getParcelableArrayList<ContentValues>("data") val data = intent.extras.getParcelableArrayList<ContentValues>("data")
if (data != null) { if (data != null) {