fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding a helper function for checking if the app is set as the default dialer

Browse Source
This commit is contained in:
tibbi
2018-11-30 16:35:21 +01:00
parent b6e00fba44
commit 7331217e8a
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt
View File

@ -11,6 +11,7 @@ import android.telecom.TelecomManager
import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.extensions.isDefaultDialer
import com.simplemobiletools.contacts.pro.extensions.telecomManager import com.simplemobiletools.contacts.pro.extensions.telecomManager
@TargetApi(Build.VERSION_CODES.M) @TargetApi(Build.VERSION_CODES.M)
@ -25,7 +26,7 @@ class DialerActivity : SimpleActivity() {
callNumber = intent.data callNumber = intent.data
// make sure Simple Contacts is the default Phone app before initiating an outgoing call // make sure Simple Contacts is the default Phone app before initiating an outgoing call
if (telecomManager.defaultDialerPackage != packageName) { if (!isDefaultDialer()) {
val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER).putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName) val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER).putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName)
startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER) startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
} else { } else {
@ -56,7 +57,7 @@ class DialerActivity : SimpleActivity() {
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData) super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == REQUEST_CODE_SET_DEFAULT_DIALER) { if (requestCode == REQUEST_CODE_SET_DEFAULT_DIALER) {
if (telecomManager.defaultDialerPackage != packageName) { if (!isDefaultDialer()) {
finish() finish()
} else { } else {
initOutgoingCall() initOutgoingCall()

3
app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
View File

@ -338,3 +338,6 @@ fun Context.deleteBlockedNumber(number: String) {
val uri = contentResolver.insert(BlockedNumbers.CONTENT_URI, values) val uri = contentResolver.insert(BlockedNumbers.CONTENT_URI, values)
contentResolver.delete(uri, null, null) contentResolver.delete(uri, null, null)
} }
@TargetApi(Build.VERSION_CODES.M)
fun Context.isDefaultDialer() = telecomManager.defaultDialerPackage != packageName

4
app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/RecentsFragment.kt
View File

@ -14,8 +14,8 @@ import com.simplemobiletools.commons.helpers.isMarshmallowPlus
import com.simplemobiletools.contacts.pro.activities.EditContactActivity import com.simplemobiletools.contacts.pro.activities.EditContactActivity
import com.simplemobiletools.contacts.pro.adapters.RecentCallsAdapter import com.simplemobiletools.contacts.pro.adapters.RecentCallsAdapter
import com.simplemobiletools.contacts.pro.extensions.contactClicked import com.simplemobiletools.contacts.pro.extensions.contactClicked
import com.simplemobiletools.contacts.pro.extensions.isDefaultDialer
import com.simplemobiletools.contacts.pro.extensions.normalizeNumber import com.simplemobiletools.contacts.pro.extensions.normalizeNumber
import com.simplemobiletools.contacts.pro.extensions.telecomManager
import com.simplemobiletools.contacts.pro.helpers.IS_FROM_SIMPLE_CONTACTS import com.simplemobiletools.contacts.pro.helpers.IS_FROM_SIMPLE_CONTACTS
import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE
import com.simplemobiletools.contacts.pro.helpers.RECENTS_TAB_MASK import com.simplemobiletools.contacts.pro.helpers.RECENTS_TAB_MASK
@ -28,7 +28,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
@TargetApi(Build.VERSION_CODES.M) @TargetApi(Build.VERSION_CODES.M)
override fun placeholderClicked() { override fun placeholderClicked() {
if (!isMarshmallowPlus() || (isMarshmallowPlus() && context.telecomManager.defaultDialerPackage == context.packageName)) { if (!isMarshmallowPlus() || (isMarshmallowPlus() && context.isDefaultDialer())) {
activity!!.handlePermission(PERMISSION_WRITE_CALL_LOG) { activity!!.handlePermission(PERMISSION_WRITE_CALL_LOG) {
if (it) { if (it) {
activity!!.handlePermission(PERMISSION_READ_CALL_LOG) { activity!!.handlePermission(PERMISSION_READ_CALL_LOG) {