wbrawner/Simple-Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing a couple crashes

Browse source
This commit is contained in:
tibbi 2018-06-19 14:51:19 +02:00
parent dfb31b40a5
commit 170d7438f8
5 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
View file

@ -104,9 +104,7 @@ abstract class ContactActivity : SimpleActivity() {
}
fun shareContact() {
if (contact != null) {
shareContacts(arrayListOf(contact!!))
}
shareContacts(arrayListOf(contact!!))
}
fun trySendSMS() {

12
app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
View file

@ -94,6 +94,10 @@ class EditContactActivity : ContactActivity() {
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (contact == null) {
return true
}
when (item.itemId) {
R.id.save -> saveContact()
R.id.share -> shareContact()
@ -232,7 +236,11 @@ class EditContactActivity : ContactActivity() {
Intent().apply {
action = Intent.ACTION_EDIT
data = getContactPublicUri(contact!!)
startActivity(this)
if (resolveActivity(packageManager) != null) {
startActivity(this)
} else {
toast(R.string.no_app_found)
}
}
}
@ -713,7 +721,7 @@ class EditContactActivity : ContactActivity() {
}
private fun saveContact() {
if (isSaving || contact == null) {
if (isSaving) {
return
}

12
app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
View file

@ -354,10 +354,14 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
return
}
val inputStream = contentResolver.openInputStream(uri)
val out = FileOutputStream(tempFile)
inputStream.copyTo(out)
showImportContactsDialog(tempFile.absolutePath)
try {
val inputStream = contentResolver.openInputStream(uri)
val out = FileOutputStream(tempFile)
inputStream.copyTo(out)
showImportContactsDialog(tempFile.absolutePath)
} catch (e: Exception) {
showErrorToast(e)
}
}
else -> toast(R.string.invalid_file_format)
}

4
app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
View file

@ -57,6 +57,10 @@ class ViewContactActivity : ContactActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (contact == null) {
return true
}
when (item.itemId) {
R.id.edit -> editContact(contact!!)
R.id.share -> shareContact()

5
app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
View file

@ -145,7 +145,10 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
val contactsToRemove = ArrayList<Contact>()
selectedPositions.sortedDescending().forEach {
contactsToRemove.add(contactItems[it])
val contact = contactItems.getOrNull(it)
if (contact != null) {
contactsToRemove.add(contact)
}
}
contactItems.removeAll(contactsToRemove)