From c65cc9574d111bcf955b844d55271a9726aaaa31 Mon Sep 17 00:00:00 2001 From: Mysochenko Yuriy Date: Wed, 11 May 2022 17:21:34 +0300 Subject: [PATCH] clean up --- .../simplemobiletools/dialer/activities/CallActivity.kt | 8 -------- .../com/simplemobiletools/dialer/helpers/CallManager.kt | 5 +++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index d6b69655..025121b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -135,14 +135,6 @@ class CallActivity : SimpleActivity() { toggleHold() } - call_conference.setOnClickListener { - /*if (is conference) { - // show manage conference screen - } else { - // show dialpad and contacts - }*/ - } - call_end.setOnClickListener { endCall() } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt index 9da7ac54..d6655490 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt @@ -10,6 +10,7 @@ import com.simplemobiletools.commons.extensions.getPhoneNumberTypeText import com.simplemobiletools.commons.helpers.MyContactsContentProvider import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import com.simplemobiletools.dialer.extensions.getStateCompat import com.simplemobiletools.dialer.models.CallContact // inspired by https://github.com/Chooloo/call_manage @@ -24,7 +25,7 @@ class CallManager { fun reject() { if (call != null) { - if (call!!.state == Call.STATE_RINGING) { + if (call!!.getStateCompat() == Call.STATE_RINGING) { call!!.reject(false, null) } else { call!!.disconnect() @@ -53,7 +54,7 @@ class CallManager { fun getState() = if (call == null) { Call.STATE_DISCONNECTED } else { - call!!.state + call!!.getStateCompat() } fun keypad(c: Char) {