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

- If contact's name is empty, use contact's SIP URI as contact's name.

Browse Source 
- Relaxed checking of contact's name.
This commit is contained in:
Juha Heinanen
2019-11-15 04:03:26 +02:00
parent 0e94f8c4ed
commit bb75df705d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+5 -2
View File
@@ -71,7 +71,11 @@ class ContactActivity : AppCompatActivity() {
R.id.checkIcon -> { R.id.checkIcon -> {
val newName = nameView.text.toString().trim() var newName = nameView.text.toString().trim()
var newUri = uriView.text.toString().trim()
if (newName == "") newName = newUri
if (!Utils.checkName(newName)) { if (!Utils.checkName(newName)) {
Utils.alertView(this, getString(R.string.error), Utils.alertView(this, getString(R.string.error),
String.format(getString(R.string.invalid_contact), newName)) String.format(getString(R.string.invalid_contact), newName))
@@ -89,7 +93,6 @@ class ContactActivity : AppCompatActivity() {
return false return false
} }
var newUri = uriView.text.toString().trim()
if (!newUri.startsWith("sip:")) { if (!newUri.startsWith("sip:")) {
if (newUri.contains("@") || (BaresipService.uas.size != 1)) { if (newUri.contains("@") || (BaresipService.uas.size != 1)) {
newUri = "sip:$newUri" newUri = "sip:$newUri"
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+2 -5
View File
@@ -214,11 +214,8 @@ object Utils {
} }
fun checkName(name: String): Boolean { fun checkName(name: String): Boolean {
if (name.length < 2) return false return name.isNotEmpty() && name == String(name.toByteArray(), Charsets.UTF_8) &&
for (c in name) { name.lines().size == 1
if (!c.isLetterOrDigit() && !(c in "-.!%*_+`'~ ")) return false
}
return true
} }
fun checkIfName(name: String): Boolean { fun checkIfName(name: String): Boolean {