mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update check version message

Browse source
This commit is contained in:
Erwan Croze 2018-10-02 15:40:59 +02:00
parent c03a332343
commit a6dcc769b5
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values-fr/strings.xml
View file

@ -48,6 +48,7 @@
<string name="yes">Oui</string>
<string name="link_account">Associer votre compte</string>
<string name="you">Vous</string>
<string name="update_available">Mobile Security Intense - Mise à jour\nUne nouvelle version MSI %s est disponible.\nPour continuer de fonctionner la mise à jour est nécessaire.</string>
<!--Launch screen-->
<string name="app_description">le client SIP <i>libre</i></string>
<!--Assistant-->

2
res/values/strings.xml
View file

@ -52,7 +52,7 @@
<string name="ok">OK</string>
<string name="yes">Yes</string>
<string name="link_account">Link your account</string>
<string name="update_available">An update is available</string>
<string name="update_available">An update is available, version %s</string>
<string name="you">You</string>
<!-- Launch screen -->

2
src/android/org/linphone/LinphoneManager.java
View file

@ -1649,7 +1649,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
@Override
public void run() {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setMessage(getString(R.string.update_available) + ": " + versionAv);
builder.setMessage(getString(R.string.update_available).replace("%s", versionAv));
builder.setCancelable(false);
builder.setNeutralButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
@Override

2
src/android/org/linphone/LinphoneUtils.java
View file

@ -846,7 +846,7 @@ public final class LinphoneUtils {
public static boolean isUs(ProxyConfig proxy, String username) {
if (proxy == null || username == null || username.isEmpty()) return false;
Address proxyConfigContact = proxy.getContact();
return proxyConfigContact.getUsername().equalsIgnoreCase(username);
return (proxyConfigContact != null) && proxyConfigContact.getUsername().equalsIgnoreCase(username);
}
public static ZrtpPeerStatus getZrtpStatus(Core lc, String uri) {