Added text to explain to user he'll have to retype password if he edits username and/or domain & revert previous commit

This commit is contained in:
Sylvain Berfini 2014-07-21 17:32:43 +02:00
parent 484d9e4cc2
commit f9c135a3f1
5 changed files with 4 additions and 1 deletions

View file

@ -203,6 +203,7 @@
<string name="pref_help_outbound_proxy">Faire passer tous les appels via le serveur mandataire SIP</string>
<string name="pref_help_username">Exemple: john si votre compte est john@sip.example.org</string>
<string name="pref_help_domain">sip.example.org si votre compte est john@sip.example.org</string>
<string name="pref_help_password">Vous devrez retaper votre mot de passe si vous changez votre nom d\'utilisateur ou le domaine</string>
<string name="delete">Supprimer</string>
<string name="chat">Chat</string>

View file

@ -250,6 +250,7 @@
<string name="pref_help_outbound_proxy">Отправить все звонки через SIP прокси</string>
<string name="pref_help_username">Например: john если Ваш адрес john@sip.example.org</string>
<string name="pref_help_domain">sip.example.org если Ваш адрес john@sip.example.org</string>
<string name="pref_help_password">You have to re-enter your password if you edit the username and/or the domain</string>
<string name="delete">Удалить</string>
<string name="chat">Чат</string>

View file

@ -248,6 +248,7 @@
<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
<string name="delete">Delete</string>
<string name="chat">Chat</string>

View file

@ -17,6 +17,7 @@
<EditTextPreference
android:title="@string/pref_passwd"
android:dialogMessage="@string/pref_help_password"
android:persistent="true"/>
<EditTextPreference

View file

@ -1003,7 +1003,6 @@ public class LinphoneManager implements LinphoneCoreListener {
mAudioManager.setMode(MODE_RINGTONE);
}
routeAudioToSpeaker();
try {
if ((mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE || mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL) && mVibrator != null) {
long[] patern = {0,1000,1000};