fixing some crashes and ANRs

This commit is contained in:
tibbi
2020-11-04 14:34:55 +01:00
parent b42fc83f8c
commit ad9710cef0
3 changed files with 38 additions and 26 deletions

View File

@ -189,7 +189,9 @@ class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList<SimpleCo
}
if (!activity.isDestroyed) {
SimpleContactsHelper(context).loadContactImage(contact.photoUri, findViewById(R.id.item_contact_image), contact.name)
}
}
}
}

View File

@ -124,10 +124,14 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
}
}
} else {
ensureBackgroundThread {
val lookupKey = SimpleContactsHelper(activity!!).getContactLookupKey((contact).rawId.toString())
val publicUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey)
activity?.runOnUiThread {
activity!!.launchViewContactIntent(publicUri)
}
}
}
}.apply {
fragment_list.adapter = this
}

View File

@ -3,6 +3,8 @@ package com.simplemobiletools.dialer.helpers
import android.annotation.SuppressLint
import android.content.Context
import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.telecom.Call
import android.telecom.InCallService
import android.telecom.VideoProfile
@ -55,10 +57,11 @@ class CallManager {
}
fun getCallContact(context: Context, callback: (CallContact?) -> Unit) {
ensureBackgroundThread {
val callContact = CallContact("", "", "")
if (call == null || call!!.details == null || call!!.details!!.handle == null) {
callback(callContact)
return
return@ensureBackgroundThread
}
val uri = Uri.decode(call!!.details.handle.toString())
@ -71,6 +74,7 @@ class CallManager {
if (callContact.name != callContact.number) {
callback(callContact)
} else {
Handler(Looper.getMainLooper()).post {
val privateCursor = context.getMyContactsCursor().loadInBackground()
ensureBackgroundThread {
val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor)
@ -85,3 +89,5 @@ class CallManager {
}
}
}
}
}