- Do not subscribe to message waiting indication when account is created.

This commit is contained in:
Juha Heinanen
2020-03-27 08:13:46 +02:00
parent e6a1c356ad
commit 29e5e16baf
3 changed files with 10 additions and 10 deletions
@@ -110,7 +110,7 @@ class Account(val accp: String) {
if (vmUri == "") if (vmUri == "")
res = res + ";mwi=no" res = res + ";mwi=no"
else else
res = res + ";vm_uri=\"$vmUri\"" res = res + ";mwi=yes;vm_uri=\"$vmUri\""
res += ";ptime=20;regint=${regint};regq=0.5;pubint=0;call_transfer=yes" res += ";ptime=20;regint=${regint};regq=0.5;pubint=0;call_transfer=yes"
@@ -418,21 +418,21 @@ class AccountActivity : AppCompatActivity() {
save = true save = true
} }
var vmUri = voicemailUri.text.toString().trim() var tVmUri = voicemailUri.text.toString().trim()
if (vmUri != acc.vmUri) { if (tVmUri != acc.vmUri) {
if (vmUri != "") { if (tVmUri != "") {
if (!vmUri.startsWith("sip:")) vmUri = "sip:$vmUri" if (!tVmUri.startsWith("sip:")) tVmUri = "sip:$tVmUri"
if (!vmUri.contains("@")) vmUri = "$vmUri@${acc.host()}" if (!tVmUri.contains("@")) tVmUri = "$tVmUri@${acc.host()}"
if (!Utils.checkSipUri(vmUri)) { if (!Utils.checkSipUri(tVmUri)) {
Utils.alertView(this, getString(R.string.notice), Utils.alertView(this, getString(R.string.notice),
String.format(getString(R.string.invalid_voicemail_uri), vmUri)) String.format(getString(R.string.invalid_voicemail_uri), tVmUri))
return false return false
} }
account_set_mwi(acc.accp, "yes") account_set_mwi(acc.accp, "yes")
} else { } else {
account_set_mwi(acc.accp, "no") account_set_mwi(acc.accp, "no")
} }
acc.vmUri = vmUri acc.vmUri = tVmUri
save = true save = true
} }
@@ -40,7 +40,7 @@ class AccountsActivity : AppCompatActivity() {
String.format(getString(R.string.account_exists), aor.split(":")[0])) String.format(getString(R.string.account_exists), aor.split(":")[0]))
} else { } else {
val laddr = "sip:$aor" val laddr = "sip:$aor"
val ua = UserAgent.uaAlloc("<$laddr>;stunserver=\"stun:stun.l.google.com:19302\";regq=0.5;pubint=0;regint=0") val ua = UserAgent.uaAlloc("<$laddr>;stunserver=\"stun:stun.l.google.com:19302\";regq=0.5;pubint=0;regint=0;mwi=no")
if (ua == null) { if (ua == null) {
Log.e("Baresip", "Failed to allocate UA for $aor") Log.e("Baresip", "Failed to allocate UA for $aor")
Utils.alertView(this, getString(R.string.notice), Utils.alertView(this, getString(R.string.notice),