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

- If Authentication Username is not given, it defaults to account's username.

Browse Source
This commit is contained in:
Juha Heinanen
2020-03-20 11:51:23 +02:00
parent 483baddfc5
commit 5b9457c283
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+20 -19
View File
@@ -227,12 +227,6 @@ class AccountActivity : AppCompatActivity() {
val au = authUser.text.toString().trim() val au = authUser.text.toString().trim()
val ap = authPass.text.toString().trim() val ap = authPass.text.toString().trim()
if ((au == "") && (ap != "")) {
Utils.alertView(this, getString(R.string.notice),
getString(R.string.authentication_username_password_mismatch))
return false
}
if (au != acc.authUser) { if (au != acc.authUser) {
if (checkAuthUser(au)) { if (checkAuthUser(au)) {
if (account_set_auth_user(acc.accp, au) == 0) { if (account_set_auth_user(acc.accp, au) == 0) {
@@ -249,24 +243,31 @@ class AccountActivity : AppCompatActivity() {
} }
} }
if ((ap != acc.authPass) && (ap != "")) { if (ap != acc.authPass) {
if (Utils.checkPrintAscii(ap) && (ap.length <= 64)) { if (ap != "") {
if (account_set_auth_pass(acc.accp, ap) == 0) { if (Utils.checkPrintAscii(ap) && (ap.length <= 64)) {
acc.authPass = account_auth_pass(acc.accp) if (account_set_auth_pass(acc.accp, ap) == 0) {
MainActivity.aorPasswords.remove(aor) acc.authPass = account_auth_pass(acc.accp)
// Log.d("Baresip", "New auth password is ${acc.authPass}") MainActivity.aorPasswords.remove(aor)
save = true // Log.d("Baresip", "New auth password is ${acc.authPass}")
save = true
} else {
Log.e("Baresip", "Setting of auth pass failed")
}
} else { } else {
Log.e("Baresip", "Setting of auth pass failed") Utils.alertView(this, getString(R.string.notice),
String.format(getString(R.string.invalid_authentication_password), ap))
return false
} }
} else { } else {
Utils.alertView(this, getString(R.string.notice), if ((au != "") && !MainActivity.aorPasswords.containsKey(aor)) {
String.format(getString(R.string.invalid_authentication_password), ap)) MainActivity.aorPasswords.put(aor, acc.authPass)
return false save = true
}
} }
} else { } else {
if ((ap == "") && !MainActivity.aorPasswords.containsKey(aor)) { if (MainActivity.aorPasswords.containsKey(aor)) {
MainActivity.aorPasswords.put(aor, acc.authPass) MainActivity.aorPasswords.remove(aor)
save = true save = true
} }
} }
app/src/main/res/values-fi/strings.xml
+3 -4
View File
@@ -38,12 +38,11 @@
<string name="display_name_help">Tilin käyttäjän nimi, joka esiintyy <string name="display_name_help">Tilin käyttäjän nimi, joka esiintyy
SIP-sanomien From URI:ssa (vapaaehtoinen).</string> SIP-sanomien From URI:ssa (vapaaehtoinen).</string>
<string name="invalid_display_name">Virheellinen tilin käyttäjän nimi \'%1$s\'</string> <string name="invalid_display_name">Virheellinen tilin käyttäjän nimi \'%1$s\'</string>
<string name="authentication_username_password_mismatch">Salasanaa ei
voi antaa ilman käyttäjätunnusta.
</string>
<string name="authentication_username">Käyttäjätunnus</string> <string name="authentication_username">Käyttäjätunnus</string>
<string name="authentication_username_help">Todentamiseen käytettävä <string name="authentication_username_help">Todentamiseen käytettävä
käyttäjätunnus, jos välityspalvelin vaatii sellaisen.</string> käyttäjätunnus, jos välityspalvelin vaatii sellaisen. Oletusarvo on
tilin käyttäjätunnus.
</string>
<string name="invalid_authentication_username">Virheellinen käyttäjätunnus \'%1$s\'</string> <string name="invalid_authentication_username">Virheellinen käyttäjätunnus \'%1$s\'</string>
<string name="authentication_password">Salasana</string> <string name="authentication_password">Salasana</string>
<string name="authentication_password_help">Todentamiseen käytettävä <string name="authentication_password_help">Todentamiseen käytettävä
app/src/main/res/values/strings.xml
+2 -4
View File
@@ -41,11 +41,9 @@
<string name="your_name">Your 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="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="invalid_display_name">Invalid Display Name \'%1$s\'</string>
<string name="authentication_username_password_mismatch">Authentication Password cannot be given without Authentication Username.
</string>
<string name="authentication_username">Authentication Username</string> <string name="authentication_username">Authentication Username</string>
<string name="authentication_username_help">Authentication username if authentication of SIP <string name="authentication_username_help">Authentication username
requests is required. if authentication of SIP requests is required. Default value is account\'s username.
</string> </string>
<string name="invalid_authentication_username">Invalid Authentication Username \'%1$s\'</string> <string name="invalid_authentication_username">Invalid Authentication Username \'%1$s\'</string>
<string name="authentication_password">Authentication Password</string> <string name="authentication_password">Authentication Password</string>