fenix
/
Simple-Dialer
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conference_call 

# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt
This commit is contained in:
Mysochenko Yuriy 2022-05-17 17:41:37 +03:00
parent 7dcdc36ce9 a4f22dc7b5
commit b56684ca40
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt
View File

@ -1,9 +1,12 @@
package com.simplemobiletools.dialer.services package com.simplemobiletools.dialer.services
import android.app.KeyguardManager
import android.content.Context
import android.telecom.Call import android.telecom.Call
import android.telecom.InCallService import android.telecom.InCallService
import android.util.Log import android.util.Log
import com.simplemobiletools.dialer.activities.CallActivity import com.simplemobiletools.dialer.activities.CallActivity
import com.simplemobiletools.dialer.extensions.getStateCompat
import com.simplemobiletools.dialer.extensions.isOutgoing import com.simplemobiletools.dialer.extensions.isOutgoing
import com.simplemobiletools.dialer.extensions.powerManager import com.simplemobiletools.dialer.extensions.powerManager
import com.simplemobiletools.dialer.helpers.CallManager import com.simplemobiletools.dialer.helpers.CallManager
@ -25,15 +28,19 @@ class CallService : InCallService() {
override fun onCallAdded(call: Call) { override fun onCallAdded(call: Call) {
super.onCallAdded(call) super.onCallAdded(call)
Log.d(TAG, "onCallAdded: $call")
CallManager.onCallAdded(call) CallManager.onCallAdded(call)
if ((!powerManager.isInteractive || call.isOutgoing())) {
startActivity(CallActivity.getStartIntent(this))
}
call.registerCallback(callListener)
CallManager.inCallService = this CallManager.inCallService = this
call.registerCallback(callListener)
val isScreenLocked = (getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager).isDeviceLocked
if (!powerManager.isInteractive || call.isOutgoing() || isScreenLocked) {
startActivity(CallActivity.getStartIntent(this))
if (call.getStateCompat() != Call.STATE_RINGING) {
callNotificationManager.setupNotification() callNotificationManager.setupNotification()
Log.d(TAG, "onCallAdded: calls=${CallManager.calls.size}") }
} else {
callNotificationManager.setupNotification()
}
} }
override fun onCallRemoved(call: Call) { override fun onCallRemoved(call: Call) {