fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-18 12:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some threading issues at Edit and View screens

Browse Source
This commit is contained in:
tibbi 2018-11-05 22:35:34 +01:00
parent 6b687a1890
commit ba108340b1
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,20 +140,30 @@ class EditContactActivity : ContactActivity() {
} }
if (contactId != 0) { if (contactId != 0) {
contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false)) Thread {
if (contact == null) { contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false))
toast(R.string.unknown_error_occurred) if (contact == null) {
finish() toast(R.string.unknown_error_occurred)
return finish()
} } else {
runOnUiThread {
gotContact()
}
}
}.start()
} else {
gotContact()
} }
}
private fun gotContact() {
if (contact == null) { if (contact == null) {
setupNewContact() setupNewContact()
} else { } else {
setupEditContact() setupEditContact()
} }
val action = intent.action
if ((contact!!.id == 0 && intent.extras != null && intent.extras.containsKey(KEY_PHONE) && 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 phone = intent.extras.get(KEY_PHONE) val phone = intent.extras.get(KEY_PHONE)
if (phone != null) { if (phone != null) {

25
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
View File

@ -98,21 +98,28 @@ class ViewContactActivity : ContactActivity() {
} }
if (contactId != 0 && !wasLookupKeyUsed) { if (contactId != 0 && !wasLookupKeyUsed) {
contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false)) Thread {
contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false))
if (contact == null) {
toast(R.string.unknown_error_occurred)
finish()
} else {
runOnUiThread {
gotContact()
}
}
}.start()
} else {
if (contact == null) { if (contact == null) {
toast(R.string.unknown_error_occurred)
finish() finish()
return } else {
gotContact()
} }
} }
}
if (contact == null) { private fun gotContact() {
finish()
return
}
setupViewContact() setupViewContact()
contact_send_sms.beVisibleIf(contact!!.phoneNumbers.isNotEmpty()) contact_send_sms.beVisibleIf(contact!!.phoneNumbers.isNotEmpty())
contact_start_call.beVisibleIf(contact!!.phoneNumbers.isNotEmpty()) contact_start_call.beVisibleIf(contact!!.phoneNumbers.isNotEmpty())
contact_send_email.beVisibleIf(contact!!.emails.isNotEmpty()) contact_send_email.beVisibleIf(contact!!.emails.isNotEmpty())