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

fixed one more main activity layout bug

Browse Source
This commit is contained in:
Juha Heinanen
2018-06-03 20:48:55 +03:00
parent d3c7ce29ca
commit 76e476886e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,6 +531,7 @@ class MainActivity : AppCompatActivity() {
} }
private fun addCallViews(ua: UserAgent, call: Call, id: Int) { private fun addCallViews(ua: UserAgent, call: Call, id: Int) {
Log.d("Baresip", "Adding incoming views for UA ${ua.uap} Call ${call.callp}")
val acc = ua.account val acc = ua.account
val caller_heading = TextView(appContext) val caller_heading = TextView(appContext)
caller_heading.text = "Incoming call from ..." caller_heading.text = "Incoming call from ..."
@ -626,7 +627,7 @@ class MainActivity : AppCompatActivity() {
val answer_button = ImageButton(appContext) val answer_button = ImageButton(appContext)
answer_button.tag = call.status answer_button.tag = call.status
if (answer_button.tag == "Answer") if (call.status == "Answer")
answer_button.setImageResource(R.drawable.call) answer_button.setImageResource(R.drawable.call)
else else
answer_button.setImageResource(R.drawable.hangup) answer_button.setImageResource(R.drawable.hangup)
@ -637,15 +638,11 @@ class MainActivity : AppCompatActivity() {
Log.i("Baresip", "UA ${call.ua.uap} accepting incoming call ${call.callp}") Log.i("Baresip", "UA ${call.ua.uap} accepting incoming call ${call.callp}")
ua_answer(call.ua.uap, call.callp) ua_answer(call.ua.uap, call.callp)
if (call.dir == "in") { if (call.dir == "in") {
Log.d("Baresip", "Updating Hangup and Hold")
call.status = "Hangup"
call.hold = false
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
Log.d("Baresip", "Setting answer button at ${answer_button.id} to Hangup") call.status = "Hangup"
// val answer_button = layout.findViewById(answer_button.id) as ImageButton call.hold = false
answer_button.tag = "Hangup" answer_button.tag = "Hangup"
answer_button.setImageResource(R.drawable.hangup) answer_button.setImageResource(R.drawable.hangup)
Log.d("Baresip", "Setting reject button at ${answer_button.id + 1} to Hold")
val reject_button = layout.findViewById(answer_button.id + 1) as ImageButton val reject_button = layout.findViewById(answer_button.id + 1) as ImageButton
reject_button.tag = "Hold" reject_button.tag = "Hold"
reject_button.setImageResource(R.drawable.hold) reject_button.setImageResource(R.drawable.hold)
@ -849,7 +846,7 @@ class MainActivity : AppCompatActivity() {
call.hasHistory = true call.hasHistory = true
} else { } else {
Log.d("Baresip", "Inbound call $callp established") Log.d("Baresip", "Inbound call $callp established")
call.status = "Answer" call.status = "Hangup"
call.security = R.drawable.box_red call.security = R.drawable.box_red
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == uas[aorSpinner.selectedItemPosition]) { if (ua == uas[aorSpinner.selectedItemPosition]) {
@ -996,7 +993,7 @@ class MainActivity : AppCompatActivity() {
history.add(History(aor, call.peerURI,"in", false)) history.add(History(aor, call.peerURI,"in", false))
} }
} else { } else {
Log.d("Baresip", "Removing outgoing call $uap / $callp / " + Log.d("Baresip", "Removing outgoing call $uap/$callp/" +
call.peerURI) call.peerURI)
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == uas[aorSpinner.selectedItemPosition]) { if (ua == uas[aorSpinner.selectedItemPosition]) {