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

- Added check that that Authentication Username and Password are either

Browse Source 
both given or neither is given.
- Used en and fi language strings in invalid account entity notices.
This commit is contained in:
Juha Heinanen
2020-03-04 08:42:30 +02:00
parent ba5b2ea72c
commit 97af201076
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

@ -215,12 +215,20 @@ class AccountActivity : AppCompatActivity() {
Log.e("Baresip", "Setting of display name failed")
}
} else {
Utils.alertView(this, "Notice", "Invalid Display Name: $dn")
Utils.alertView(this, "Notice",
String.format(getString(R.string.invalid_display_name), dn))
return false
}
}
val au = authUser.text.toString().trim()
val ap = authPass.text.toString().trim()
if (((au != "") && (ap == "")) || ((au == "") && (ap != ""))) {
Utils.alertView(this, "Notice",
getString(R.string.authentication_username_password_mismatch))
return false
}
if (au != acc.authUser) {
if (checkAuthUser(au)) {
if (account_set_auth_user(acc.accp, au) == 0) {
@ -232,12 +240,11 @@ class AccountActivity : AppCompatActivity() {
}
} else {
Utils.alertView(this, "Notice",
"Invalid Authentication UserName: $au")
String.format(getString(R.string.invalid_authentication_username), au))
return false
}
}
val ap = authPass.text.toString().trim()
if (ap != acc.authPass) {
if (Utils.checkPrintAscii(ap)) {
if (account_set_auth_pass(acc.accp, ap) == 0) {
@ -249,7 +256,7 @@ class AccountActivity : AppCompatActivity() {
}
} else {
Utils.alertView(this, "Notice",
"Invalid Authentication Password: $ap")
String.format(getString(R.string.invalid_authentication_password), ap))
return false
}
}
@ -279,7 +286,7 @@ class AccountActivity : AppCompatActivity() {
}
} else {
Utils.alertView(this, "Notice",
"Invalid Proxy Server URI: ${ob[i]}")
String.format(getString(R.string.invalid_proxy_server_uri), ob[i]))
return false
}
}
@ -326,7 +333,7 @@ class AccountActivity : AppCompatActivity() {
if (acc.stunServer != newStunServer) {
if (!Utils.checkHostPort(newStunServer)) {
Utils.alertView(this, "Notice",
"Invalid STUN Server '$newStunServer'")
String.format(getString(R.string.invalid_stun_server), newStunServer))
return false
}
var host = ""
@ -404,7 +411,7 @@ class AccountActivity : AppCompatActivity() {
if (!vmUri.contains("@")) vmUri = "$vmUri@${acc.host()}"
if (!Utils.checkSipUri(vmUri)) {
Utils.alertView(this, "Notice",
"Invalid Voicemail URI: $vmUri")
String.format(getString(R.string.invalid_voicemail_uri), vmUri))
return false
}
account_set_mwi(acc.accp, "yes")

9
app/src/main/res/values-fi/strings.xml
View File

@ -37,12 +37,18 @@
<string name="your_name">Tilin käyttäjän nimi</string>
<string name="display_name_help">Tilin käyttäjän nimi, joka esiintyy
SIP-sanomien From URI:ssa (vapaaehtoinen).</string>
<string name="invalid_display_name">Virheellinen tilin käyttäjän nimi \'%1$s\'</string>
<string name="authentication_username_password_mismatch">Käyttäjätunnus ja salasana ovat molemmat
annettava ellei kumpikin ole tyhjä.
</string>
<string name="authentication_username">Käyttäjätunnus</string>
<string name="authentication_username_help">Todentamiseen käytettävä
käyttäjätunnus, jos välityspalvelin vaatii sellaisen.</string>
<string name="invalid_authentication_username">Virheellinen käyttäjätunnus \'%1$s\'</string>
<string name="authentication_password">Salasana</string>
<string name="authentication_password_help">Todentamiseen käytettävä
salasana, jos välityspalvelin vaatii sellaisen.</string>
<string name="invalid_authentication_password">Virheellinen salasana \'%1$s\'</string>
<string name="outbound_proxies">Välityspalvelimet</string>
<string name="outbound_proxies_help">Yhden tai kahden
välityspalvelimen SIP URI, joille SIP-sanomat lähetetään. Jos
@ -60,6 +66,7 @@
<string name="sip_uri_of_proxy_server">Välityspalvelimen SIP URI</string>
<string name="sip_uri_of_another_proxy_server">Toisen
välityspalvelimen SIP URI</string>
<string name="invalid_proxy_server_uri">Virheellinen välityspalvelimen URI \'%1$s\'</string>
<string name="register">Rekisteröi</string>
<string name="register_help">Jos merkitty, rekisteröinti on
aktiivinen ja REGISTER-sanomat lähetetään noin 12 minuutin välein.
@ -78,6 +85,7 @@
osoittaa Google:n julkiseen STUN-palvelimeen. Käyttäjätunnusta ja
salasanaa ei voi tällä hetkellä antaa.
</string>
<string name="invalid_stun_server">Virheellinen STUN-palvelin \'%1$s\'</string>
<string name="media_encryption">Median salaus</string>
<string name="media_encryption_help">Valitsee median salausprotokollan (vapaaehtoinen).
\n • ZRTP (suositeltu) tarkoittaa, että ZRTP-salausta yritetään neuvotella sen jälkeen, kun puhelu on alkanut.
@ -106,6 +114,7 @@
puhepostiviestien kuunteluun. Jos URI:a ei ole annettu, tietoa
mahdollista puhepostiviesteistä (Message Waiting Indications) ei tilata.
</string>
<string name="invalid_voicemail_uri">Virheellinen puhepostin URI \'%1$s\'</string>
<string name="default_account">Oletustili</string>
<string name="default_account_help">Jos merkitty, niin tämä tili on
valittuna, kun baresip käynnistetään.

17
app/src/main/res/values/strings.xml
View File

@ -40,10 +40,20 @@
<string name="display_name">Display Name</string>
<string name="your_name">Your Name</string>
<string name="display_name_help">Name (if any) used in From URI of outbound requests.</string>
<string name="invalid_display_name">Invalid Display Name \'%1$s\'</string>
<string name="authentication_username_password_mismatch">Autentication Username and Authentication
Password must both be given or both must be empty.
</string>
<string name="authentication_username">Authentication Username</string>
<string name="authentication_username_help">Authentication username if required by outbound proxy.</string>
<string name="authentication_username_help">Authentication username if authentication of SIP
requests is required.
</string>
<string name="invalid_authentication_username">Invalid Authentication Username \'%1$s\'</string>
<string name="authentication_password">Authentication Password</string>
<string name="authentication_password_help">Authentication password if required by outbound proxy.</string>
<string name="authentication_password_help">Authentication password if authentication of SIP
requests is required.
</string>
<string name="invalid_authentication_password">Invalid Authentication Password \'%1$s\'</string>
<string name="outbound_proxies">Outbound Proxies</string>
<string name="outbound_proxies_help">SIP URI of one or two proxies that must be used when sending requests.
If two is given, REGISTER requests are sent to both and other requests are sent to
@ -56,6 +66,7 @@
</string>
<string name="sip_uri_of_proxy_server">SIP URI of Proxy Server</string>
<string name="sip_uri_of_another_proxy_server">SIP URI of another Proxy Server</string>
<string name="invalid_proxy_server_uri">Invalid Proxy Server URI \'%1$s\'</string>
<string name="register">Register</string>
<string name="register_help">If checked, registration is enabled and REGISTER requests are sent at
12 minute intervals.
@ -72,6 +83,7 @@
Factory default value is \'stun.l.google.com:19302\', pointing to public Google STUN server.
Username and password are currently not supported.
</string>
<string name="invalid_stun_server">Invalid STUN Server \'%1$s\'</string>
<string name="stun_server_default" translatable="false">stun.l.google.com:19302</string>
<string name="media_encryption">Media Encryption</string>
<string name="media_encryption_help">Selects media transport encryption protocol (if any).
@ -94,6 +106,7 @@
<string name="voicemain_uri_help">SIP URI for checking of voicemail messages. If left empty, voicemail
messages (Message Waiting Indications) are not subscribed to.
</string>
<string name="invalid_voicemail_uri">Invalid Voicemail URI \'%1$s\'</string>
<string name="default_account">Default Account</string>
<string name="default_account_help">If checked, this account is selected when baresip is started.
</string>