From a6dcc769b5b5dc8d37c421ba808ca9273e07238f Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 2 Oct 2018 15:40:59 +0200
Subject: [PATCH] Update check version message

---
 res/values-fr/strings.xml                     | 1 +
 res/values/strings.xml                        | 2 +-
 src/android/org/linphone/LinphoneManager.java | 2 +-
 src/android/org/linphone/LinphoneUtils.java   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 49ec7b818..9e69274c9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -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-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d3d76894e..6f40ccc53 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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 -->
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 3babe12e5..79afbe958 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -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
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 53ae3c0b2..a4846b8ae 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -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) {