jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved handling of speakerphone

Browse Source
This commit is contained in:
Juha Heinanen
2020-12-13 11:56:34 +02:00
parent 08bc6f73fa
commit 6ef7c6a058
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
View File

@ -362,11 +362,6 @@ class BaresipService: Service() {
updateStatusNotification()
}
"SetSpeaker" -> {
Log.d(LOG_TAG, "Set speakerphone $speakerPhone")
am.isSpeakerphoneOn = speakerPhone
}
"Stop", "Stop Force" -> {
if (!isServiceClean) cleanService()
if (isServiceRunning) baresipStop(action == "Stop Force")
@ -686,15 +681,13 @@ class BaresipService: Service() {
resetCallVolume()
if (am.mode != AudioManager.MODE_NORMAL)
am.mode = AudioManager.MODE_NORMAL
if (am.isSpeakerphoneOn) am.isSpeakerphoneOn = false
am.isSpeakerphoneOn = false
if (am.isBluetoothScoOn) {
Log.d(LOG_TAG, "Stopping Bluetooth SCO")
am.stopBluetoothSco()
} else {
abandonAudioFocus()
}
speakerPhone = false
am.isSpeakerphoneOn = false
proximitySensing(false)
}
if (ua.account.callHistory && !call.hasHistory) {
@ -1140,7 +1133,6 @@ class BaresipService: Service() {
var isConfigInitialized = false
var libraryLoaded = false
var isServiceClean = false
var speakerPhone = false
var callVolume = 0
var dynDns = false
var netInterface = ""

14
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -902,6 +902,10 @@ class MainActivity : AppCompatActivity() {
menuInflater.inflate(R.menu.main_menu, menu)
menuInflater.inflate(R.menu.speaker_icon, menu)
speakerIcon = menu.findItem(R.id.speakerIcon)
if (am.isSpeakerphoneOn)
speakerIcon.setIcon(R.drawable.speaker_on)
else
speakerIcon.setIcon(R.drawable.speaker_off)
return true
}
@ -912,13 +916,11 @@ class MainActivity : AppCompatActivity() {
when (item.itemId) {
R.id.speakerIcon -> {
if (BaresipService.speakerPhone)
item.setIcon(R.drawable.speaker_off)
else
am.isSpeakerphoneOn = !am.isSpeakerphoneOn
if (am.isSpeakerphoneOn)
item.setIcon(R.drawable.speaker_on)
BaresipService.speakerPhone = !BaresipService.speakerPhone
baresipService.setAction("SetSpeaker")
startService(baresipService)
else
item.setIcon(R.drawable.speaker_off)
}
R.id.config -> {