remove debug logs
This commit is contained in:
parent
a94496c55c
commit
936f232f44
|
@ -14,7 +14,6 @@ import android.os.Looper
|
||||||
import android.os.PowerManager
|
import android.os.PowerManager
|
||||||
import android.telecom.Call
|
import android.telecom.Call
|
||||||
import android.telecom.CallAudioState
|
import android.telecom.CallAudioState
|
||||||
import android.util.Log
|
|
||||||
import android.view.MotionEvent
|
import android.view.MotionEvent
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
|
@ -30,8 +29,6 @@ import com.simplemobiletools.dialer.models.CallContact
|
||||||
import kotlinx.android.synthetic.main.activity_call.*
|
import kotlinx.android.synthetic.main.activity_call.*
|
||||||
import kotlinx.android.synthetic.main.dialpad.*
|
import kotlinx.android.synthetic.main.dialpad.*
|
||||||
|
|
||||||
const val TAG = "SimpleDialer:CallActivityTag"
|
|
||||||
|
|
||||||
class CallActivity : SimpleActivity() {
|
class CallActivity : SimpleActivity() {
|
||||||
companion object {
|
companion object {
|
||||||
fun getStartIntent(context: Context): Intent {
|
fun getStartIntent(context: Context): Intent {
|
||||||
|
@ -408,7 +405,6 @@ class CallActivity : SimpleActivity() {
|
||||||
|
|
||||||
private fun updateCallState(call: Call) {
|
private fun updateCallState(call: Call) {
|
||||||
val state = call.getStateCompat()
|
val state = call.getStateCompat()
|
||||||
Log.d(TAG, "updateCallState: $state")
|
|
||||||
when (state) {
|
when (state) {
|
||||||
Call.STATE_RINGING -> callRinging()
|
Call.STATE_RINGING -> callRinging()
|
||||||
Call.STATE_ACTIVE -> callStarted()
|
Call.STATE_ACTIVE -> callStarted()
|
||||||
|
@ -434,7 +430,6 @@ class CallActivity : SimpleActivity() {
|
||||||
|
|
||||||
private fun updateState() {
|
private fun updateState() {
|
||||||
val phoneState = CallManager.getPhoneState()
|
val phoneState = CallManager.getPhoneState()
|
||||||
Log.d(TAG, "updateState: $phoneState")
|
|
||||||
if (phoneState is SingleCall) {
|
if (phoneState is SingleCall) {
|
||||||
updateCallState(phoneState.call)
|
updateCallState(phoneState.call)
|
||||||
updateCallOnHoldState(null)
|
updateCallOnHoldState(null)
|
||||||
|
@ -541,7 +536,6 @@ class CallActivity : SimpleActivity() {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPrimaryCallChanged(call: Call) {
|
override fun onPrimaryCallChanged(call: Call) {
|
||||||
Log.d(TAG, "onPrimaryCallChanged: $call")
|
|
||||||
callDurationHandler.removeCallbacks(updateCallDurationTask)
|
callDurationHandler.removeCallbacks(updateCallDurationTask)
|
||||||
updateCallContactInfo(call)
|
updateCallContactInfo(call)
|
||||||
updateState()
|
updateState()
|
||||||
|
|
|
@ -4,15 +4,11 @@ import android.annotation.SuppressLint
|
||||||
import android.telecom.Call
|
import android.telecom.Call
|
||||||
import android.telecom.InCallService
|
import android.telecom.InCallService
|
||||||
import android.telecom.VideoProfile
|
import android.telecom.VideoProfile
|
||||||
import android.util.Log
|
|
||||||
import com.simplemobiletools.dialer.extensions.getStateCompat
|
import com.simplemobiletools.dialer.extensions.getStateCompat
|
||||||
import com.simplemobiletools.dialer.extensions.hasCapability
|
import com.simplemobiletools.dialer.extensions.hasCapability
|
||||||
import com.simplemobiletools.dialer.extensions.isConference
|
import com.simplemobiletools.dialer.extensions.isConference
|
||||||
import java.util.concurrent.CopyOnWriteArraySet
|
import java.util.concurrent.CopyOnWriteArraySet
|
||||||
|
|
||||||
const val TAG = "SimpleDialer:CallManager"
|
|
||||||
const val TAG2 = TAG /*"SimpleDialer:CallState"*/
|
|
||||||
|
|
||||||
// inspired by https://github.com/Chooloo/call_manage
|
// inspired by https://github.com/Chooloo/call_manage
|
||||||
class CallManager {
|
class CallManager {
|
||||||
companion object {
|
companion object {
|
||||||
|
@ -25,23 +21,19 @@ class CallManager {
|
||||||
fun onCallAdded(call: Call) {
|
fun onCallAdded(call: Call) {
|
||||||
this.call = call
|
this.call = call
|
||||||
calls.add(call)
|
calls.add(call)
|
||||||
Log.d(TAG, "onCallAdded (${calls.size}): $call")
|
|
||||||
for (listener in listeners) {
|
for (listener in listeners) {
|
||||||
listener.onPrimaryCallChanged(call)
|
listener.onPrimaryCallChanged(call)
|
||||||
}
|
}
|
||||||
call.registerCallback(object : Call.Callback() {
|
call.registerCallback(object : Call.Callback() {
|
||||||
override fun onStateChanged(call: Call, state: Int) {
|
override fun onStateChanged(call: Call, state: Int) {
|
||||||
Log.d(TAG, "onStateChanged: $call")
|
|
||||||
updateState()
|
updateState()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDetailsChanged(call: Call, details: Call.Details) {
|
override fun onDetailsChanged(call: Call, details: Call.Details) {
|
||||||
Log.d(TAG, "onDetailsChanged")
|
|
||||||
updateState()
|
updateState()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onConferenceableCallsChanged(call: Call, conferenceableCalls: MutableList<Call>) {
|
override fun onConferenceableCallsChanged(call: Call, conferenceableCalls: MutableList<Call>) {
|
||||||
Log.d(TAG, "onConferenceableCallsChanged (${conferenceableCalls.size}): $call")
|
|
||||||
updateState()
|
updateState()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -49,22 +41,18 @@ class CallManager {
|
||||||
|
|
||||||
fun onCallRemoved(call: Call) {
|
fun onCallRemoved(call: Call) {
|
||||||
calls.remove(call)
|
calls.remove(call)
|
||||||
Log.d(TAG, "onCallRemoved (${calls.size}): $call")
|
|
||||||
updateState()
|
updateState()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getPhoneState(): PhoneState {
|
fun getPhoneState(): PhoneState {
|
||||||
return when (calls.size) {
|
return when (calls.size) {
|
||||||
0 -> {
|
0 -> {
|
||||||
Log.d(TAG2, "No call")
|
|
||||||
NoCall
|
NoCall
|
||||||
}
|
}
|
||||||
1 -> {
|
1 -> {
|
||||||
Log.d(TAG2, "Single call")
|
|
||||||
SingleCall(calls.first())
|
SingleCall(calls.first())
|
||||||
}
|
}
|
||||||
2 -> {
|
2 -> {
|
||||||
Log.d(TAG2, "Two calls")
|
|
||||||
val active = calls.find { it.getStateCompat() == Call.STATE_ACTIVE }
|
val active = calls.find { it.getStateCompat() == Call.STATE_ACTIVE }
|
||||||
val newCall = calls.find { it.getStateCompat() == Call.STATE_CONNECTING || it.getStateCompat() == Call.STATE_DIALING }
|
val newCall = calls.find { it.getStateCompat() == Call.STATE_CONNECTING || it.getStateCompat() == Call.STATE_DIALING }
|
||||||
val onHold = calls.find { it.getStateCompat() == Call.STATE_HOLDING }
|
val onHold = calls.find { it.getStateCompat() == Call.STATE_HOLDING }
|
||||||
|
@ -87,18 +75,13 @@ class CallManager {
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
Log.d(TAG2, "Conference call (${conference.children.size} children)")
|
|
||||||
Log.d(TAG2, "secondCall: $secondCall")
|
|
||||||
if (secondCall == null) {
|
if (secondCall == null) {
|
||||||
Log.d(TAG2, "Conference call (single)")
|
|
||||||
SingleCall(conference)
|
SingleCall(conference)
|
||||||
} else {
|
} else {
|
||||||
val newCallState = secondCall.getStateCompat()
|
val newCallState = secondCall.getStateCompat()
|
||||||
if (newCallState == Call.STATE_ACTIVE || newCallState == Call.STATE_CONNECTING || newCallState == Call.STATE_DIALING) {
|
if (newCallState == Call.STATE_ACTIVE || newCallState == Call.STATE_CONNECTING || newCallState == Call.STATE_DIALING) {
|
||||||
Log.d(TAG2, "Conference call and regular call (conference on hold)")
|
|
||||||
TwoCalls(secondCall, conference)
|
TwoCalls(secondCall, conference)
|
||||||
} else {
|
} else {
|
||||||
Log.d(TAG2, "Conference call and regular call (regular call on hold)")
|
|
||||||
TwoCalls(conference, secondCall)
|
TwoCalls(conference, secondCall)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue