From 28ae1de0662993d8fb9e8de0eee75aa3c70ad2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Tue, 9 Oct 2018 15:26:30 +0200
Subject: [PATCH] Removed hard coded user agent

---
 res/values/non_localizable_custom.xml                 | 1 +
 src/android/org/linphone/LinphoneManager.java         | 2 +-
 src/androidTest/org/linphone/LinphoneTestManager.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index b2999db13..bea0ab54c 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -8,6 +8,7 @@
 	<string name="sync_account_type">org.linphone</string> <!-- Change package ! -->
 	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
 	<string name="rls_uri">sip:rls@sip.linphone.org</string>
+	<string name="user_agent">LinphoneAndroid</string>
 	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
 	<bool name="force_use_of_linphone_friends">false</bool>
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 7746d9a1c..60a9e809a 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -708,7 +708,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
                 //Api to check version can't use version code
                 mLc.checkForUpdate(versionName);
             }
-            mLc.setUserAgent("LinphoneAndroid", versionName);
+            mLc.setUserAgent(mServiceContext.getResources().getString(R.string.user_agent), versionName);
         } catch (NameNotFoundException e) {
             Log.e(e, "cannot get version name");
         }
diff --git a/src/androidTest/org/linphone/LinphoneTestManager.java b/src/androidTest/org/linphone/LinphoneTestManager.java
index d888be409..81af7be02 100644
--- a/src/androidTest/org/linphone/LinphoneTestManager.java
+++ b/src/androidTest/org/linphone/LinphoneTestManager.java
@@ -115,7 +115,7 @@ public class LinphoneTestManager implements LinphoneCoreListener{
 				if (versionName == null) {
 					versionName = String.valueOf(c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionCode);
 				}
-				mLc.setUserAgent("LinphoneAndroid", versionName);
+				mLc.setUserAgent(mIContext.getResources().getString(R.string.user_agent), versionName);
 			} catch (NameNotFoundException e) {
 				Log.e(e, "cannot get version name");
 			}